diff --git a/services/cmd/main.go b/services/cmd/main.go index f36948e69..324a0a202 100644 --- a/services/cmd/main.go +++ b/services/cmd/main.go @@ -5,6 +5,7 @@ import ( "flag" "fmt" "go_dreamfactory/comm" + "go_dreamfactory/lego" "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" "io/ioutil" @@ -33,6 +34,7 @@ var confCmd = &cobra.Command{ Use: "conf", Short: "生成配置", Run: func(cmd *cobra.Command, args []string) { + lego.Recover("conf") conf() }, } @@ -40,6 +42,7 @@ var startCmd = &cobra.Command{ Use: "start", Short: "启动程序", Run: func(cmd *cobra.Command, args []string) { + lego.Recover("start") start() }, } @@ -47,6 +50,7 @@ var stopCmd = &cobra.Command{ Use: "stop", Short: "关闭程序", Run: func(cmd *cobra.Command, args []string) { + lego.Recover("stop") stop() }, } @@ -54,6 +58,7 @@ var restart = &cobra.Command{ Use: "restart", Short: "重启服务", Run: func(cmd *cobra.Command, args []string) { + lego.Recover("restart") stop() start() }, @@ -115,6 +120,7 @@ func conf() { } } } + log.Errorf("conf succ!") } //启动程序 @@ -179,6 +185,7 @@ func start() { } } } + log.Errorf("start succ!") } //关闭程序 @@ -197,6 +204,7 @@ func stop() { } } } + log.Errorf("stop succ!") } ///转换区服配置到服务配置 @@ -211,7 +219,7 @@ func rederServiceSttings(config *comm.GameConfig) (ss []*core.ServiceSttings, er if ip, port, err = parseaddr(config.Mainte); err != nil { return } else { - if sseting, err = convertServiceSttings(config, 0, comm.Service_Mainte, ip, config.MaintePort, port); err != nil { + if sseting, err = convertServiceSttings(config, 0, comm.Service_Mainte, ip, config.MaintePort, port, config.OpenServiceTime); err != nil { return } ss = append(ss, sseting) @@ -221,7 +229,7 @@ func rederServiceSttings(config *comm.GameConfig) (ss []*core.ServiceSttings, er if ip, port, err = parseaddr(v); err != nil { return } else { - if sseting, err = convertServiceSttings(config, i, comm.Service_Worker, ip, port, 0); err != nil { + if sseting, err = convertServiceSttings(config, i, comm.Service_Worker, ip, port, 0, config.OpenServiceTime); err != nil { return } ss = append(ss, sseting) @@ -231,7 +239,7 @@ func rederServiceSttings(config *comm.GameConfig) (ss []*core.ServiceSttings, er if ip, port, err = parseaddr(v); err != nil { return } else { - if sseting, err = convertServiceSttings(config, i, comm.Service_Gateway, ip, config.GatewayPorts[i], port); err != nil { + if sseting, err = convertServiceSttings(config, i, comm.Service_Gateway, ip, config.GatewayPorts[i], port, config.OpenServiceTime); err != nil { return } ss = append(ss, sseting) @@ -260,11 +268,12 @@ func readergmconf(path string) (config *comm.GameConfig, err error) { } //转换游戏服务配置 -func convertServiceSttings(config *comm.GameConfig, id int, stype string, ip string, rport int, lport int) (sseting *core.ServiceSttings, err error) { +func convertServiceSttings(config *comm.GameConfig, id int, stype string, ip string, rport int, lport int, opentime string) (sseting *core.ServiceSttings, err error) { sseting = &core.ServiceSttings{} sseting.Tag = config.AreaId sseting.Ip = ip sseting.Port = rport + sseting.Opentime = opentime sseting.Modules = make(map[string]map[string]interface{}) sseting.Sys = make(map[string]map[string]interface{}) sseting.Sys["rpcx"] = map[string]interface{}{ @@ -306,6 +315,7 @@ func convertServiceSttings(config *comm.GameConfig, id int, stype string, ip str } sseting.Sys["configure"] = map[string]interface{}{ "ConfigurePath": "./json", + "TimestampFile": "./timestamp.text", } sseting.Sys["wordfilter"] = map[string]interface{}{ "WorldFile": "./wordfilter.json",