commit

aarch64/pjisuv/common/config/cloud-config.yaml

@@ -52,13 +52,9 @@ hosts:
   - name: node1
     ip: 192.168.1.102
     topics:
-      - /AutoModeStatus
       - /camera_image
       - /cicv_location
-      - /faultinfo
       - /heartbeat_info
-      - /jinlong_control_pub
-      - /cicv_location
       - /data_read
   - name: node2
     ip: 192.168.1.103

aarch64/pjisuv/control/main/control.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"cicv-data-closedloop/aarch64/pjisuv/common/config"
+	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
-	"cicv-data-closedloop/kinglong/common/log"
 	commonService "cicv-data-closedloop/kinglong/common/svc"
 	"net/rpc"
 	"os"
@@ -14,7 +14,7 @@ import (
 func init() {
 	runtime.GOMAXPROCS(1)
 	// 初始化日志配置
-	log.InitLogConfig("kinglong-control")
+	c_log.InitLog("/mnt/media/sda1/cicv-data-closedloop/log/", "pjisuv-control")
 	// 初始化本地配置文件（第1处配置，在本地文件）
 	config.InitLocalConfig()
 	// 初始化Oss连接信息
@@ -31,7 +31,7 @@ func main() {
 		// 1 获取当前设备的任务的 status
 		status, err := config.GetStatus(config.PlatformConfig.TaskConfigId)
 		if err != nil {
-			log.GlobalLogger.Error("获取配置status失败：", err)
+			c_log.GlobalLogger.Error("获取配置status失败：", err)
 			continue
 		}
 		// 2 判断 status
@@ -48,45 +48,45 @@ func main() {
 			// 3 发送rpc信号杀死两个服务，并重启程序
 			if lastStatus == "NONE" && status == "CHANGE" {
 				if _, err := util.ExecuteWithPath(config.LocalConfig.RestartCmd.Dir, config.LocalConfig.RestartCmd.Name, config.LocalConfig.RestartCmd.Args...); err != nil {
-					log.GlobalLogger.Info("启动新程序失败,【path】=", config.LocalConfig.RestartCmd.Dir, "【cmd】=", config.LocalConfig.RestartCmd.Name, config.LocalConfig.RestartCmd.Args, "：", err)
+					c_log.GlobalLogger.Info("启动新程序失败,【path】=", config.LocalConfig.RestartCmd.Dir, "【cmd】=", config.LocalConfig.RestartCmd.Name, config.LocalConfig.RestartCmd.Args, "：", err)
 					os.Exit(-1)
 				}
-				log.GlobalLogger.Info("启动任务，本地执行启动命令：【path】=", config.LocalConfig.RestartCmd.Dir, "【cmd】=", config.LocalConfig.RestartCmd.Name, config.LocalConfig.RestartCmd.Args)
+				c_log.GlobalLogger.Info("启动任务，本地执行启动命令：【path】=", config.LocalConfig.RestartCmd.Dir, "【cmd】=", config.LocalConfig.RestartCmd.Name, config.LocalConfig.RestartCmd.Args)
 				lastStatus = status
-				log.GlobalLogger.Info("获取数据闭环平台最新配置。")
+				c_log.GlobalLogger.Info("获取数据闭环平台最新配置。")
 				config.InitPlatformConfig()
 				continue
 			}
 			var killArgs *commonService.KillSignal
 			if lastStatus == "UN_CHANGE" && status == "CHANGE" {
 				killArgs = &commonService.KillSignal{NodeName: config.LocalConfig.Node.Name, DropUploadData: config.PlatformConfig.DropUploadData, Restart: true}
-				log.GlobalLogger.Info("更新任务，发送rpc重启信号到本地"+config.LocalConfig.Node.Name+"：", killArgs)
+				c_log.GlobalLogger.Info("更新任务，发送rpc重启信号到本地"+config.LocalConfig.Node.Name+"：", killArgs)
 			}
 			if lastStatus == "UN_CHANGE" && status == "NONE" {
 				killArgs = &commonService.KillSignal{NodeName: config.LocalConfig.Node.Name, DropUploadData: config.PlatformConfig.DropUploadData, Restart: false}
-				log.GlobalLogger.Info("杀死任务，发送rpc结束信号到本地"+config.LocalConfig.Node.Name+"：", killArgs)
+				c_log.GlobalLogger.Info("杀死任务，发送rpc结束信号到本地"+config.LocalConfig.Node.Name+"：", killArgs)
 			}
 
 			KillRpcClient, err := rpc.Dial("tcp", config.LocalConfig.Node.Ip+":"+config.CloudConfig.RpcPort)
 			if err != nil {
-				log.GlobalLogger.Error("创建rpc客户端连接master失败：", err)
+				c_log.GlobalLogger.Error("创建rpc客户端连接master失败：", err)
 				// 此处关闭client会报错
 				continue
 			}
 
 			reply := 0
 			if err = KillRpcClient.Call("KillService.Kill", killArgs, &reply); err != nil {
-				log.GlobalLogger.Error("发送rpc请求到master失败：", err)
+				c_log.GlobalLogger.Error("发送rpc请求到master失败：", err)
 				//TODO 这里可能会报错 unexpected EOF 但是不影响，先注释 close 和 continue
 				//KillRpcClient.Close()
 				//continue
 			}
 			lastStatus = status
-			log.GlobalLogger.Info("获取数据闭环平台最新配置。")
+			c_log.GlobalLogger.Info("获取数据闭环平台最新配置。")
 			config.InitPlatformConfig()
 			KillRpcClient.Close()
 		} else {
-			log.GlobalLogger.Error("未知的采集任务状态。【status】=", status)
+			c_log.GlobalLogger.Error("未知的采集任务状态。【status】=", status)
 		}
 	}
 }

aarch64/pjisuv/master/main/master.go

@@ -12,7 +12,7 @@ import (
 func init() {
 	// 初始化日志配置
 	//runtime.GOMAXPROCS(1)
-	c_log.InitLog("/mnt/media/sda1/cicv-data-closedloop/", "pjisuv-master")
+	c_log.InitLog("/mnt/media/sda1/cicv-data-closedloop/log/", "pjisuv-master")
 	commonInit.Init()
 	// 初始化加载触发器插件文件
 	masterConfig.InitTriggerConfig()