commit

kinglong/common/svc/kill_self.go

@@ -70,26 +70,26 @@ func AddKillTimes(info string) {
 
 	switch info {
 	case "1":
+		close(ChannelKillRosRecord)
+		KillTimes++
 		log.GlobalLogger.Infof("已杀死record打包goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 		ChannelKillDiskClean <- 1
-		KillTimes++
-		close(ChannelKillRosRecord)
 	case "2":
-		log.GlobalLogger.Infof("已杀死bag包数量维护goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
-		KillTimes++
 		close(ChannelKillDiskClean)
-	case "3":
-		log.GlobalLogger.Infof("已杀死时间窗口生产者，当前自杀进度 %v / %v", KillTimes, KillChannel)
 		KillTimes++
+		log.GlobalLogger.Infof("已杀死bag包数量维护goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
+	case "3":
 		close(ChannelKillWindowProducer)
-	case "4":
-		log.GlobalLogger.Infof("已杀死bag包移动goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 		KillTimes++
+		log.GlobalLogger.Infof("已杀死时间窗口生产者，当前自杀进度 %v / %v", KillTimes, KillChannel)
+	case "4":
 		close(ChannelKillMove)
-	case "5":
-		log.GlobalLogger.Infof("已杀死bag包消费goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 		KillTimes++
+		log.GlobalLogger.Infof("已杀死bag包移动goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
+	case "5":
 		close(ChannelKillConsume)
+		KillTimes++
+		log.GlobalLogger.Infof("已杀死bag包消费goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 	}
 	MutexKill.Unlock()
 }

pji/common/svc/kill_self.go

@@ -75,26 +75,26 @@ func AddKillTimes(info string) {
 
 	switch info {
 	case "1":
-		c_log.GlobalLogger.Infof("已杀死record打包goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 		ChannelKillDiskClean <- 1
-		KillTimes++
 		close(ChannelKillRosRecord)
-	case "2":
-		c_log.GlobalLogger.Infof("已杀死bag包数量维护goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 		KillTimes++
+		c_log.GlobalLogger.Infof("已杀死record打包goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
+	case "2":
 		close(ChannelKillDiskClean)
-	case "3":
-		c_log.GlobalLogger.Infof("已杀死rosnode和ros订阅者goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 		KillTimes++
+		c_log.GlobalLogger.Infof("已杀死bag包数量维护goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
+	case "3":
 		close(ChannelKillSubscriber)
-	case "4":
-		c_log.GlobalLogger.Infof("已杀死bag包移动goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 		KillTimes++
+		c_log.GlobalLogger.Infof("已杀死rosnode和ros订阅者goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
+	case "4":
 		close(ChannelKillMove)
-	case "5":
-		c_log.GlobalLogger.Infof("已杀死bag包消费goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 		KillTimes++
+		c_log.GlobalLogger.Infof("已杀死bag包移动goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
+	case "5":
 		close(ChannelKillConsume)
+		KillTimes++
+		c_log.GlobalLogger.Infof("已杀死bag包消费goroutine，当前自杀进度 %v / %v", KillTimes, KillChannel)
 	}
 	MutexKill.Unlock()
 }