From 30a9ba339429593c552b31dbbfb4f67ed56ac466 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 24 一月 2022 16:55:28 +0800
Subject: [PATCH] 修改系统日志数据结构
---
logc.go | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/logc.go b/logc.go
index 3c79b5c..515dfc2 100644
--- a/logc.go
+++ b/logc.go
@@ -1,8 +1,7 @@
package logc
import (
- "basic.com/valib/bhomebus.git"
- "basic.com/valib/bhshmq.git/proto/source/bhome_msg"
+ "basic.com/valib/c_bhomebus.git/proto/source/bhome_msg"
"fmt"
"sync"
"time"
@@ -17,20 +16,19 @@
)
const (
- TypeManual = iota + 1 //浜哄伐鎿嶄綔鏃ュ織,绯荤粺鍗囩骇,鎽勫儚鏈轰慨鏀�,绠楁硶淇敼...
- TypeLoginOut //鐧诲綍鐧诲嚭鏃ュ織
- TypePollInfo //杞贰鎽勫儚鏈哄強鍏跺搴旂殑绠楁硶
- TypeStackInfo //鏁版嵁鏍堝鐞嗘儏鍐�
- TypeWarnInfo //鏁呴殰淇℃伅
- TypeRunInfo //杩愯鎯呭喌,gpu,mem,cpu
- TypeSysInfo //绯荤粺鍙傛暟鍙樻洿,ip,server name,寮�鍏虫満淇℃伅
+ TypeManual = iota + 1 //浜哄伐鎿嶄綔鏃ュ織,绯荤粺鍗囩骇,鎽勫儚鏈轰慨鏀�,绠楁硶淇敼...
+ TypeLoginOut //鐧诲綍鐧诲嚭鏃ュ織
+ TypePollInfo //杞贰鎽勫儚鏈哄強鍏跺搴旂殑绠楁硶
+ TypeStackInfo //鏁版嵁鏍堝鐞嗘儏鍐�
+ TypeWarnInfo //鏁呴殰淇℃伅
+ TypeRunInfo //杩愯鎯呭喌,gpu,mem,cpu
+ TypeSysInfo //绯荤粺鍙傛暟鍙樻洿,ip,server name,寮�鍏虫満淇℃伅
)
type LogPrinter interface {
Marshal() ([]byte, error)
Topic() string
}
-
type LogInfo struct {
ID string `gorm:"column:id;primary_key;unique" json:"id"`
@@ -45,21 +43,21 @@
}
type LogRegister struct {
- Nodes []bhome_msg.BHAddress
- Topic string
- Payload []byte
+ Nodes []bhome_msg.BHAddress
+ Topic string
+ Payload []byte
}
type LogReportCallback func(*LogRegister)
var (
- logCh chan LogPrinter
- logger *Log
+ logCh chan LogPrinter
+ logger *Log
ProcName string
- ProcID string
+ ProcID string
)
-func Init(flogWriter LogReportCallback, log *Log, procId string, procName string, wg *sync.WaitGroup, done chan struct{}) bool {
+func Init(flogWriter LogReportCallback, log *Log, procId string, procName string, wg *sync.WaitGroup, done chan struct{}) bool {
logCh = make(chan LogPrinter, 300)
if nil != log {
@@ -107,6 +105,10 @@
}
deliverLog(log, timeout)
+}
+
+func SaveRuleServerLog(ruleServerPushLog RuleServerPushLog, timeout time.Duration) {
+ deliverLog(&ruleServerPushLog, timeout)
}
func deliverLog(l LogPrinter, timeout time.Duration) {
@@ -161,11 +163,13 @@
//}
const (
- OperationLogTopic = "operationLogSaveTopic"
- ScheduleLogTopic = "scheduleLogSaveTopic"
+ OperationLogTopic = "operationLogSaveTopic"
+ ScheduleLogTopic = "scheduleLogSaveTopic"
+ RuleServerLogTopic = "ruleServerLogSaveTopic"
+ VaSystemLogTopic = "VaSystemLogSaveTopic"
)
-func saveLoop(logCallback LogReportCallback, wg *sync.WaitGroup, done chan struct{}) {
+func saveLoop(logCallback LogReportCallback, wg *sync.WaitGroup, done chan struct{}) {
defer wg.Done()
if nil == logCallback {
@@ -174,23 +178,23 @@
for {
select {
- case <- done:
+ case <-done:
return
- case log := <- logCh:
+ case log := <-logCh:
payload, err := log.Marshal()
if err != nil {
logger.Error("failed to Marshal", log)
} else {
- var nodes []bhomebus.NetNode
- nodes = append(nodes, bhomebus.NetNode{})
+ var nodes []bhome_msg.BHAddress
+ nodes = append(nodes, bhome_msg.BHAddress{})
- reg := &LogRegister {
- nodes,
- log.Topic(),
- payload,
- }
+ reg := &LogRegister{
+ nodes,
+ log.Topic(),
+ payload,
+ }
- logCallback(reg)
+ logCallback(reg)
}
}
}
--
Gitblit v1.8.0