commit

kinglong/common/svc/rosbag_upload.go

@@ -35,10 +35,8 @@ outLoop:
 			// 1 获取即将处理的窗口
 			currentTimeWindow := global.TimeWindowConsumerQueue[0]
 			util.RemoveHeaOfdTimeWindowConsumerQueue()
-			log.GlobalLogger.Info("处理窗口：", currentTimeWindow.FaultTime, " - 开始")
-			log.GlobalLogger.Info("【FaultTime】=", currentTimeWindow.FaultTime)
-			log.GlobalLogger.Info("【Labels】=", currentTimeWindow.Labels)
-			log.GlobalLogger.Info("【TriggerIds】=", currentTimeWindow.TriggerIds)
+			log.GlobalLogger.Infof("开始处理窗口，【Lable】=%v，【TriggerIds】=%v，【FaultTime】=%v，【Length】=%v", currentTimeWindow.Labels, currentTimeWindow.TriggerIds, currentTimeWindow.FaultTime, currentTimeWindow.Length)
+
 			// 2 获取目录
 			dir := util.GetCopyDir(currentTimeWindow.FaultTime)
 			bags := util.ListAbsolutePathWithSuffixAndSort(dir, ".bag")
@@ -130,7 +128,7 @@ outLoop:
 
 			// 删除本地所有已上传的bag文件
 			util.RemoveDir(dir)
-			log.GlobalLogger.Info("处理窗口：", currentTimeWindow.FaultTime, " - 结束")
+			log.GlobalLogger.Infof("结束处理窗口，【Lable】=%v，【TriggerIds】=%v，【FaultTime】=%v，【Length】=%v", currentTimeWindow.Labels, currentTimeWindow.TriggerIds, currentTimeWindow.FaultTime, currentTimeWindow.Length)
 		}
 		// 每一秒扫一次
 		time.Sleep(time.Duration(1) * time.Second)

kinglong/master/pkg/svc/produce_window.go

@@ -253,13 +253,13 @@ func saveTimeWindow(faultLabel string, faultHappenTime string, lastTimeWindow *e
 			MasterTopics:    masterTopics,
 			SlaveTopics:     slaveTopics,
 		}
-		log.GlobalLogger.Info("不在旧故障窗口内，向生产者队列添加一个新窗口：", newTimeWindow)
+		log.GlobalLogger.Infof("不在旧故障窗口内，向生产者队列添加一个新窗口，【Lable】=%v，【FaultTime】=%v，【Length】=%v", lastTimeWindow.Labels, lastTimeWindow.FaultTime, lastTimeWindow.Length)
+
 		util.AddTimeWindowToTimeWindowProducerQueue(newTimeWindow)
 	} else {
 		// 2-2 如果在旧故障窗口内
 		global.TimeWindowProducerQueueMutex.RLock()
 		defer global.TimeWindowProducerQueueMutex.RUnlock()
-		log.GlobalLogger.Info("在旧故障窗口内，更新生产者队列最新的窗口 - 开始：", lastTimeWindow)
 		// 2-2-1 更新故障窗口end时间
 		maxEnd := util.TimeCustomChange(lastTimeWindow.TimeWindowBegin, commonConfig.PlatformConfig.TaskMaxTime)
 		expectEnd := util.TimeCustomChange(faultHappenTime, commonConfig.PlatformConfig.TaskAfterTime)
@@ -280,7 +280,8 @@ func saveTimeWindow(faultLabel string, faultHappenTime string, lastTimeWindow *e
 		lastTimeWindow.MasterTopics = util.MergeSlice(sourceMasterTopics, masterTopics)
 		sourceSlaveTopics := lastTimeWindow.SlaveTopics
 		lastTimeWindow.SlaveTopics = util.MergeSlice(sourceSlaveTopics, slaveTopics)
-		log.GlobalLogger.Infof("在旧故障窗口内，更新生产者队列最新的窗口，【FaultTime】=%v，【Length】=%v", lastTimeWindow.FaultTime, lastTimeWindow.Length)
+		log.GlobalLogger.Infof("在旧故障窗口内，更新生产者队列最新的窗口，【Lable】=%v，【FaultTime】=%v，【Length】=%v", lastTimeWindow.Labels, lastTimeWindow.FaultTime, lastTimeWindow.Length)
+
 	}
 }
 

pji/common/svc/rosbag_upload.go

@@ -36,7 +36,7 @@ outLoop:
 			// 1 获取即将处理的窗口
 			currentTimeWindow := global.TimeWindowConsumerQueue[0]
 			util.RemoveHeaOfdTimeWindowConsumerQueue()
-			log.GlobalLogger.Info("即将消费窗口：", currentTimeWindow)
+			log.GlobalLogger.Infof("开始处理窗口，【Lable】=%v，【TriggerIds】=%v，【FaultTime】=%v，【Length】=%v", currentTimeWindow.Labels, currentTimeWindow.TriggerIds, currentTimeWindow.FaultTime, currentTimeWindow.Length)
 			// 2 获取目录
 			dir := util.GetCopyDir(currentTimeWindow.FaultTime)
 			bags := util.ListAbsolutePathWithSuffixAndSort(dir, ".bag")
@@ -127,7 +127,7 @@ outLoop:
 
 			// 删除本地所有已上传的bag文件
 			util.RemoveDir(dir)
-			log.GlobalLogger.Info(" -------- 处理窗口：", currentTimeWindow.FaultTime, " - 结束 -------")
+			log.GlobalLogger.Infof("结束处理窗口，【Lable】=%v，【TriggerIds】=%v，【FaultTime】=%v，【Length】=%v", currentTimeWindow.Labels, currentTimeWindow.TriggerIds, currentTimeWindow.FaultTime, currentTimeWindow.Length)
 		}
 		// 每一秒扫一次
 		time.Sleep(time.Duration(1) * time.Second)

pji/master/pkg/svc/produce_window.go

@@ -214,7 +214,7 @@ func saveTimeWindow(faultLabel string, faultHappenTime string, lastTimeWindow *c
 			MasterTopics:    masterTopics,
 			SlaveTopics:     slaveTopics,
 		}
-		log.GlobalLogger.Info("不在旧故障窗口内，向生产者队列添加一个新窗口：", newTimeWindow)
+		log.GlobalLogger.Infof("不在旧故障窗口内，向生产者队列添加一个新窗口，【Lable】=%v，【FaultTime】=%v，【Length】=%v", lastTimeWindow.Labels, lastTimeWindow.FaultTime, lastTimeWindow.Length)
 		util.AddTimeWindowToTimeWindowProducerQueue(newTimeWindow)
 	} else {
 		// 2-2 如果在旧故障窗口内
@@ -240,7 +240,7 @@ func saveTimeWindow(faultLabel string, faultHappenTime string, lastTimeWindow *c
 		lastTimeWindow.MasterTopics = util.MergeSlice(sourceMasterTopics, masterTopics)
 		sourceSlaveTopics := lastTimeWindow.SlaveTopics
 		lastTimeWindow.SlaveTopics = util.MergeSlice(sourceSlaveTopics, slaveTopics)
-		log.GlobalLogger.Infof("在旧故障窗口内，更新生产者队列最新的窗口，【FaultTime】=%v，【Length】=%v", lastTimeWindow.FaultTime, lastTimeWindow.Length)
+		log.GlobalLogger.Infof("在旧故障窗口内，更新生产者队列最新的窗口，【Lable】=%v，【FaultTime】=%v，【Length】=%v", lastTimeWindow.Labels, lastTimeWindow.FaultTime, lastTimeWindow.Length)
 	}
 }