commit

kinglong/control/main/control.go

@@ -39,6 +39,7 @@ func main() {
 			log.GlobalLogger.Error("获取配置status失败：", err)
 			continue
 		}
+		log.GlobalLogger.Infof("【lastStatus】=%v，【status】=%v", lastStatus, status)
 		// 2 判断 status
 		// UN_CHANGE 没有新的任务，无需更改
 		// CHANGE 有新的任务，需要杀死旧的任务并重启
@@ -47,11 +48,9 @@ func main() {
 			lastStatus = "UN_CHANGE"
 			continue
 		} else if status == "CHANGE" || status == "NONE" {
-			// 发送rpc信号杀死两个服务，并重启程序
-			var killArgs *commonService.KillSignal
+			// 3 发送rpc信号杀死两个服务，并重启程序
 			if lastStatus == "NONE" && status == "CHANGE" {
-				_, err := util.ExecuteWithPath(commonConfig.LocalConfig.RestartCmd.Dir, commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args...)
-				if err != nil {
+				if _, err := util.ExecuteWithPath(commonConfig.LocalConfig.RestartCmd.Dir, commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args...); err != nil {
 					log.GlobalLogger.Info("启动新程序失败,【path】=", commonConfig.LocalConfig.RestartCmd.Dir, "【cmd】=", commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args, "：", err)
 					os.Exit(-1)
 				}
@@ -61,6 +60,7 @@ func main() {
 				commonConfig.InitPlatformConfig()
 				continue
 			}
+			var killArgs *commonService.KillSignal
 			if lastStatus == "UN_CHANGE" && status == "CHANGE" {
 				killArgs = &commonService.KillSignal{NodeName: cfg.LocalConfig.NodeName, DropUploadData: cfg.PlatformConfig.DropUploadData, Restart: true}
 				log.GlobalLogger.Info("更新任务，发送rpc重启信号到localhost：", killArgs)
@@ -80,7 +80,7 @@ func main() {
 			reply := 0
 			if err = KillRpcClient.Call("KillService.Kill", killArgs, &reply); err != nil {
 				log.GlobalLogger.Error("发送rpc请求到master失败：", err)
-				//TODO 这里会报错unexpected EOF但是不影响，先注释 close 和 continue
+				//TODO 这里可能会报错 unexpected EOF 但是不影响，先注释 close 和 continue
 				//KillRpcClient.Close()
 				//continue
 			}

pji/control/main/control.go

@@ -39,6 +39,7 @@ func main() {
 			c_log.GlobalLogger.Error("获取配置status失败：", err)
 			continue
 		}
+		c_log.GlobalLogger.Infof("【lastStatus】=%v，【status】=%v", lastStatus, status)
 		// 2 判断 status
 		// UN_CHANGE 没有新的任务，无需更改
 		// CHANGE 有新的任务，需要杀死旧的任务并重启
@@ -48,10 +49,8 @@ func main() {
 			continue
 		} else if status == "CHANGE" || status == "NONE" {
 			// 3 发送rpc信号杀死采集程序
-			var killArgs *commonService.KillSignal
 			if lastStatus == "NONE" && status == "CHANGE" {
-				_, err := util.ExecuteWithPath(commonConfig.LocalConfig.RestartCmd.Dir, commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args...)
-				if err != nil {
+				if _, err := util.ExecuteWithPath(commonConfig.LocalConfig.RestartCmd.Dir, commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args...); err != nil {
 					c_log.GlobalLogger.Info("启动新程序失败,【path】=", commonConfig.LocalConfig.RestartCmd.Dir, "【cmd】=", commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args, "：", err)
 					os.Exit(-1)
 				}
@@ -61,6 +60,7 @@ func main() {
 				commonConfig.InitPlatformConfig()
 				continue
 			}
+			var killArgs *commonService.KillSignal
 			if lastStatus == "UN_CHANGE" && status == "CHANGE" {
 				killArgs = &commonService.KillSignal{NodeName: "master", DropUploadData: commonConfig.PlatformConfig.DropUploadData, Restart: true}
 				c_log.GlobalLogger.Info("更新任务，发送rpc重启信号：", killArgs)
@@ -80,7 +80,7 @@ func main() {
 			reply := 0
 			if err = KillRpcClient.Call("KillService.Kill", killArgs, &reply); err != nil {
 				c_log.GlobalLogger.Error("发送 rpc 请求到 master 报错：", err)
-				//TODO 这里会报错unexpected EOF但是不影响，先注释 close 和 continue
+				//TODO 这里可能会报错unexpected EOF但是不影响，先注释 close 和 continue
 				//KillRpcClient.Close()
 				//continue
 			}