|
@@ -1,7 +1,6 @@
|
|
|
package config
|
|
package config
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
- "cicv-data-closedloop/common/config/c_log"
|
|
|
|
|
"cicv-data-closedloop/common/util"
|
|
"cicv-data-closedloop/common/util"
|
|
|
"encoding/json"
|
|
"encoding/json"
|
|
|
"fmt"
|
|
"fmt"
|
|
@@ -12,9 +11,11 @@ import (
|
|
|
"time"
|
|
"time"
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
|
|
+var resourceLogger *logrus.Logger
|
|
|
|
|
+
|
|
|
// 保存资源占用情况
|
|
// 保存资源占用情况
|
|
|
func SendResourceUsage() {
|
|
func SendResourceUsage() {
|
|
|
- initLog("/mnt/media/sda1/cicv-data-closedloop/log/", "resource")
|
|
|
|
|
|
|
+ initLog(LogDir, ResourceLogPrefix)
|
|
|
for {
|
|
for {
|
|
|
time.Sleep(time.Duration(10) * time.Second)
|
|
time.Sleep(time.Duration(10) * time.Second)
|
|
|
top10Cpu, top10Mem := util.GetTop10CpuAndMem()
|
|
top10Cpu, top10Mem := util.GetTop10CpuAndMem()
|
|
@@ -30,7 +31,7 @@ func SendResourceUsage() {
|
|
|
"deviceNumber": LocalConfig.EquipmentNo,
|
|
"deviceNumber": LocalConfig.EquipmentNo,
|
|
|
"socIp": LocalConfig.Node.Ip,
|
|
"socIp": LocalConfig.Node.Ip,
|
|
|
}
|
|
}
|
|
|
- c_log.GlobalLogger.Infof("监控信息为：%v", util.MapToReadableJsonString(requestMap))
|
|
|
|
|
|
|
+ resourceLogger.Infof("监控信息为：%v", util.MapToReadableJsonString(requestMap))
|
|
|
//responseString, err := util.HttpPostJsonWithHeaders(
|
|
//responseString, err := util.HttpPostJsonWithHeaders(
|
|
|
// CloudConfig.Monitor.Url,
|
|
// CloudConfig.Monitor.Url,
|
|
|
// map[string]string{"Authorization": "U9yKpD6kZZDDe4LFKK6myAxBUT1XRrDM"},
|
|
// map[string]string{"Authorization": "U9yKpD6kZZDDe4LFKK6myAxBUT1XRrDM"},
|
|
@@ -43,8 +44,6 @@ func SendResourceUsage() {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-var resourceLogger *logrus.Logger
|
|
|
|
|
-
|
|
|
|
|
// InitLog 初始化日志配置
|
|
// InitLog 初始化日志配置
|
|
|
func initLog(logDir string, prefix string) {
|
|
func initLog(logDir string, prefix string) {
|
|
|
time.Sleep(time.Duration(1) * time.Second)
|
|
time.Sleep(time.Duration(1) * time.Second)
|
