Przeglądaj źródła

refactor: Modify the master start-stop logic

HeWang 6 miesięcy temu
rodzic
commit
df1f1aa158

+ 1 - 1
aarch64/pjibot_guide/common/config/c_websocket.go

@@ -97,7 +97,7 @@ func InitWebsocketConfig() {
 		c_log.GlobalLogger.Info("初始化Websocket连接 - 成功。")
 		c_log.GlobalLogger.Info("初始化Websocket连接 - 成功。")
 
 
 		// 保持连接活跃
 		// 保持连接活跃
-		go keepAlive()
+		//go keepAlive()
 
 
 		// 连接成功,退出循环
 		// 连接成功,退出循环
 		reconnectionInProgress = false
 		reconnectionInProgress = false

+ 3 - 2
aarch64/pjibot_guide/control/main.go

@@ -56,13 +56,14 @@ func renew() {
 }
 }
 
 
 func startMasterNode() {
 func startMasterNode() {
+	c_log.GlobalLogger.Info("获取数据闭环平台最新配置。")
+	commonConfig.InitPlatformConfig()
+
 	if _, err := util.ExecuteWithPath(commonConfig.LocalConfig.RestartCmd.Dir, commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args...); 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)
 		c_log.GlobalLogger.Info("启动新程序失败,【path】=", commonConfig.LocalConfig.RestartCmd.Dir, "【cmd】=", commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args, ":", err)
 		os.Exit(-1)
 		os.Exit(-1)
 	}
 	}
 	c_log.GlobalLogger.Info("启动任务,本地执行启动命令:【path】=", commonConfig.LocalConfig.RestartCmd.Dir, "【cmd】=", commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args)
 	c_log.GlobalLogger.Info("启动任务,本地执行启动命令:【path】=", commonConfig.LocalConfig.RestartCmd.Dir, "【cmd】=", commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args)
-	c_log.GlobalLogger.Info("获取数据闭环平台最新配置。")
-	commonConfig.InitPlatformConfig()
 
 
 	launchedFlag = true
 	launchedFlag = true
 	c_log.GlobalLogger.Info("数采程序启动 - 成功。")
 	c_log.GlobalLogger.Info("数采程序启动 - 成功。")