|
@@ -59,10 +59,11 @@ func initRenew() {
|
|
})
|
|
})
|
|
c_log.GlobalLogger.Infof("定时时间【%v】分钟 - 成功。", RenewDur)
|
|
c_log.GlobalLogger.Infof("定时时间【%v】分钟 - 成功。", RenewDur)
|
|
}
|
|
}
|
|
|
|
+
|
|
func renew() {
|
|
func renew() {
|
|
for {
|
|
for {
|
|
time.Sleep(time.Duration(renewTurnLength) * time.Second)
|
|
time.Sleep(time.Duration(renewTurnLength) * time.Second)
|
|
- if localStatus == "running" && !renewedFlag { // 设备处于运行状态,且尚未续约
|
|
|
|
|
|
+ if localStatus == "running" && launchedFlag && !renewedFlag { // 设备处于运行状态,数采程序已启动,且尚未续约
|
|
c_log.GlobalLogger.Info("设备仍处于运行状态,续约 - 开始。")
|
|
c_log.GlobalLogger.Info("设备仍处于运行状态,续约 - 开始。")
|
|
if renewTimer != nil {
|
|
if renewTimer != nil {
|
|
renewTimer.Stop()
|
|
renewTimer.Stop()
|
|
@@ -82,17 +83,21 @@ func startMasterNode() {
|
|
if commonConfig.CheckPlatformConfigStatus(maxRetryCount) {
|
|
if commonConfig.CheckPlatformConfigStatus(maxRetryCount) {
|
|
c_log.GlobalLogger.Info("查询到数据闭环平台有配置任务。")
|
|
c_log.GlobalLogger.Info("查询到数据闭环平台有配置任务。")
|
|
commonConfig.InitPlatformConfig()
|
|
commonConfig.InitPlatformConfig()
|
|
- }
|
|
|
|
|
|
|
|
- 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)
|
|
|
|
|
|
+ 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)
|
|
|
|
+ }
|
|
|
|
+ c_log.GlobalLogger.Info("启动任务,本地执行启动命令:【path】=", commonConfig.LocalConfig.RestartCmd.Dir, "【cmd】=", commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args)
|
|
|
|
+
|
|
|
|
+ initRenew()
|
|
|
|
+ launchedFlag = true
|
|
|
|
+
|
|
|
|
+ c_log.GlobalLogger.Info("数采程序启动 - 成功。")
|
|
|
|
+ } else {
|
|
|
|
+ c_log.GlobalLogger.Error("查询到数据闭环平台没有配置任务,不启动数采程序。")
|
|
}
|
|
}
|
|
- c_log.GlobalLogger.Info("启动任务,本地执行启动命令:【path】=", commonConfig.LocalConfig.RestartCmd.Dir, "【cmd】=", commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args)
|
|
|
|
|
|
|
|
- launchedFlag = true
|
|
|
|
- initRenew()
|
|
|
|
- c_log.GlobalLogger.Info("数采程序启动 - 成功。")
|
|
|
|
}
|
|
}
|
|
|
|
|
|
func stopMasterNode() {
|
|
func stopMasterNode() {
|