commit

aarch64/pjisuv/common/config/c_global_var.go

@@ -0,0 +1,9 @@
+package config
+
+var (
+	LogDir            = "/mnt/media/sda1/cicv-data-closedloop/log/"
+	ControlLogPrefix  = "control"
+	MasterLogPrefix   = "master"
+	SlaveLogPrefix    = "slave"
+	ResourceLogPrefix = "resource"
+)

aarch64/pjisuv/common/config/c_resource.go

@@ -4,13 +4,19 @@ import (
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
 	"encoding/json"
+	"fmt"
+	"github.com/sirupsen/logrus"
+	"os"
+	"path/filepath"
+	"runtime"
 	"time"
 )
 
 // 保存资源占用情况
 func SendResourceUsage() {
+	initLog("/mnt/media/sda1/cicv-data-closedloop/log/", "resource")
 	for {
-		time.Sleep(time.Duration(5) * time.Second)
+		time.Sleep(time.Duration(10) * time.Second)
 		top10Cpu, top10Mem := util.GetTop10CpuAndMem()
 		top10CpuJson, _ := json.MarshalIndent(top10Cpu, "", "    ")
 		top10MemJson, _ := json.MarshalIndent(top10Mem, "", "    ")
@@ -36,3 +42,31 @@ func SendResourceUsage() {
 		//c_log.GlobalLogger.Infof("发送数据监控信息成功，响应信息为：%v", responseString)
 	}
 }
+
+var resourceLogger *logrus.Logger
+
+// InitLog 初始化日志配置
+func initLog(logDir string, prefix string) {
+	time.Sleep(time.Duration(1) * time.Second)
+	// 创建、追加、读写，777，所有权限
+	logPath := logDir + prefix + "-" + time.Now().Format("2006-01-02-15-04-05") + ".log"
+	err := util.CreateParentDir(logPath)
+	if err != nil {
+		os.Exit(-1)
+	}
+	f, err := os.OpenFile(logPath, os.O_CREATE|os.O_APPEND|os.O_RDWR, os.ModePerm)
+	if err != nil {
+		os.Exit(-1)
+	}
+	resourceLogger = logrus.New()
+	resourceLogger.SetOutput(f)
+	resourceLogger.SetReportCaller(true) // 开启行号显示
+	resourceLogger.SetFormatter(&logrus.JSONFormatter{
+		CallerPrettyfier: func(frame *runtime.Frame) (string, string) {
+			fileName := filepath.Base(frame.File)
+			return "", fmt.Sprintf("%s:%d", fileName, frame.Line)
+		},
+	})
+	resourceLogger.Info("初始化resourceLogger - 成功")
+
+}

aarch64/pjisuv/control/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"cicv-data-closedloop/aarch64/pjisuv/common/config"
+	commonConfig "cicv-data-closedloop/aarch64/pjisuv/common/config"
 	commonService "cicv-data-closedloop/aarch64/pjisuv/common/service"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
@@ -14,14 +14,14 @@ import (
 func init() {
 	runtime.GOMAXPROCS(1)
 	// 初始化日志配置
-	c_log.InitLog("/mnt/media/sda1/cicv-data-closedloop/log/", "pjisuv-control")
+	c_log.InitLog(commonConfig.LogDir, commonConfig.SlaveLogPrefix)
 	//c_log.InitLog("/userdata/cicv-data-closedloop/log/", "pjisuv-control")
 	// 初始化本地配置文件（第1处配置，在本地文件）
-	config.InitLocalConfig()
+	commonConfig.InitLocalConfig()
 	// 初始化Oss连接信息
-	config.InitOssConfig()
+	commonConfig.InitOssConfig()
 	// 初始化业务逻辑配置信息，配置文件在oss上（第2处配置，在oss文件）
-	config.InitCloudConfig()
+	commonConfig.InitCloudConfig()
 }
 
 func main() {
@@ -34,7 +34,7 @@ func main() {
 		}
 		wait = true
 		// 1 获取当前设备的任务的 status
-		status, err := config.GetStatus(config.PlatformConfig.TaskConfigId)
+		status, err := commonConfig.GetStatus(commonConfig.PlatformConfig.TaskConfigId)
 		if err != nil {
 			c_log.GlobalLogger.Error("获取配置status失败：", err)
 			continue
@@ -49,7 +49,7 @@ func main() {
 			continue
 		} else if status == "CHANGE" || status == "NONE" {
 			if lastStatus == "CHANGE" && status == "CHANGE" { // 供更新使用
-				config.InitPlatformConfig()
+				commonConfig.InitPlatformConfig()
 				continue
 			}
 			if lastStatus == "NONE" && status == "NONE" {
@@ -57,27 +57,27 @@ 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 {
-					c_log.GlobalLogger.Info("启动新程序失败,【path】=", config.LocalConfig.RestartCmd.Dir, "【cmd】=", config.LocalConfig.RestartCmd.Name, config.LocalConfig.RestartCmd.Args, "：", err)
+				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】=", config.LocalConfig.RestartCmd.Dir, "【cmd】=", config.LocalConfig.RestartCmd.Name, config.LocalConfig.RestartCmd.Args)
+				c_log.GlobalLogger.Info("启动任务，本地执行启动命令：【path】=", commonConfig.LocalConfig.RestartCmd.Dir, "【cmd】=", commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args)
 				lastStatus = status
 				c_log.GlobalLogger.Info("获取数据闭环平台最新配置。")
-				config.InitPlatformConfig()
+				commonConfig.InitPlatformConfig()
 				continue
 			}
 			var killArgs commonService.KillSignal
 			if lastStatus == "UN_CHANGE" && status == "CHANGE" {
-				killArgs = commonService.KillSignal{DropUploadData: config.PlatformConfig.DropUploadData, Restart: true}
+				killArgs = commonService.KillSignal{DropUploadData: commonConfig.PlatformConfig.DropUploadData, Restart: true}
 				c_log.GlobalLogger.Info("更新任务，发送rpc重启信号到本地：", killArgs)
 			}
 			if lastStatus == "UN_CHANGE" && status == "NONE" {
-				killArgs = commonService.KillSignal{DropUploadData: config.PlatformConfig.DropUploadData, Restart: false}
+				killArgs = commonService.KillSignal{DropUploadData: commonConfig.PlatformConfig.DropUploadData, Restart: false}
 				c_log.GlobalLogger.Info("杀死任务，发送rpc结束信号到本地：", killArgs)
 			}
 
-			KillRpcClient, err := rpc.Dial("tcp", config.LocalConfig.Node.Ip+":"+config.CloudConfig.RpcPort)
+			KillRpcClient, err := rpc.Dial("tcp", commonConfig.LocalConfig.Node.Ip+":"+commonConfig.CloudConfig.RpcPort)
 			if err != nil {
 				// 此处如果连接失败说明采集程序已经停止了
 				lastStatus = "NONE"
@@ -94,7 +94,7 @@ func main() {
 			}
 			lastStatus = status
 			c_log.GlobalLogger.Info("结束任务后，将数据闭环平台配置置空。")
-			config.PlatformConfig = config.PlatformConfigStruct{}
+			commonConfig.PlatformConfig = commonConfig.PlatformConfigStruct{}
 			if err = KillRpcClient.Close(); err != nil {
 				// 不做处理
 			}

aarch64/pjisuv/master/main.go

@@ -11,7 +11,7 @@ import (
 func init() {
 	// 初始化日志配置
 	// runtime.GOMAXPROCS(1)
-	c_log.InitLog("/mnt/media/sda1/cicv-data-closedloop/log/", "pjisuv-master")
+	c_log.InitLog(commonConfig.LogDir, commonConfig.MasterLogPrefix)
 	//c_log.InitLog("/userdata/cicv-data-closedloop/log/", "pjisuv-master")
 	// 初始化本地配置文件（第1处配置，在本地文件）
 	commonConfig.InitLocalConfig()

aarch64/pjisuv/slave/main.go

@@ -11,7 +11,7 @@ import (
 // init 初始化函数
 func init() {
 	//runtime.GOMAXPROCS(1)
-	c_log.InitLog("/mnt/media/sda1/cicv-data-closedloop/log/", "pjisuv-slave")
+	c_log.InitLog(commonConfig.LogDir, commonConfig.SlaveLogPrefix)
 	// 初始化本地配置文件（第1处配置，在本地文件）
 	commonConfig.InitLocalConfig()
 	// 初始化Oss连接信息