From 6c71ed49668ae5e7711b337d57051f82a3dd65cc Mon Sep 17 00:00:00 2001
From: haozhifeng <haozhifeng>
Date: 星期三, 30 六月 2021 18:54:30 +0800
Subject: [PATCH] 新增字段AddTime
---
logc.go | 218 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 135 insertions(+), 83 deletions(-)
diff --git a/logc.go b/logc.go
index 118e012..b5fd920 100644
--- a/logc.go
+++ b/logc.go
@@ -1,13 +1,9 @@
package logc
import (
- "basic.com/valib/bhomebus.git"
- "bytes"
- "net/url"
-
- "encoding/json"
+ "basic.com/valib/bhshmq.git/proto/source/bhome_msg"
"fmt"
- uuid "github.com/satori/go.uuid"
+ "sync"
"time"
)
@@ -29,6 +25,12 @@
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"`
Timestamp string `gorm:"column:timestamp" json:"timestamp"` // 2020-12-03 14:39:41
@@ -41,104 +43,154 @@
Info string `gorm:"column:info" json:"info"` // 璇︽儏
}
+type LogRegister struct {
+ Nodes []bhome_msg.BHAddress
+ Topic string
+ Payload []byte
+}
+
+type LogReportCallback func(*LogRegister)
+
var (
- msgChan chan []byte
- bhSock *bhomebus.Socket
- pubFn func(nodes []bhomebus.NetNode, topic string, data []byte, milliseconds int) int
+ logCh chan LogPrinter
+ logger *Log
ProcName string
ProcID string
)
-func InitBySock(sock *bhomebus.Socket, procId string, procName string) bool {
- msgChan = make(chan []byte, 100)
- ProcName = procName
- ProcID = procId
- bhSock = sock
- if bhSock == nil {
- return false
+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 {
+ logger = log
+ } else {
+ logger = &Log{}
}
- go saveLoop()
+ ProcName = procName
+ ProcID = procId
+
+ go saveLoop(flogWriter, wg, done)
return true
}
-func InitByPubFn(fn func(nodes []bhomebus.NetNode, topic string, data []byte, milliseconds int) int,
- procId string, procName string) bool {
- msgChan = make(chan []byte, 100)
- ProcName = procName
- ProcID = procId
- pubFn = fn
- if pubFn == nil {
- return false
- }
-
- go saveLoop()
-
- return true
-}
-
-func Save(level int, logType int, v ...interface{}) {
- cache(level, logType, "", "", v)
-}
-
-func SaveManual(level int, logType int, userID string, userName string, v ...interface{}) {
- cache(level, logType, userID, userName, v)
-}
-
-func cache(level int, logType int, userID string, userName string, fmtArgs []interface{}) {
- // Format with Sprint, Sprintf, or neither.
- msg := ""
- if len(fmtArgs) > 0 {
- msg = fmt.Sprint(fmtArgs...)
- }
- fmt.Println(msg)
-
- log := LogInfo {
- ID: uuid.NewV4().String(),
- Timestamp: time.Now().Format("2006-01-02 15:04:05"),
- ProcName: ProcName,
- ProcID: ProcID,
- Level: level,
- Type: logType,
- UserID: userID,
- UserName: userName,
- Info: msg,
- }
-
- data,err := json.Marshal(log)
- if err != nil {
- fmt.Println("json.Marshal(log) error:", log)
+func SaveOperationLog(log *OperationLog, timeout time.Duration) {
+ if nil == log {
return
}
- msgChan <- data
+ log.ProcName = ProcName
+ log.ProcID = ProcID
+
+ deliverLog(log, timeout)
}
-const (
- LogSaveTopic = "logSaveTopic"
-)
+func SaveScheduleLog(category, level int, timeout time.Duration, v ...interface{}) {
+ msg := ""
+ if len(v) > 0 {
+ msg = fmt.Sprint(v...)
+ }
-func saveLoop() {
- for {
- select {
- case data := <- msgChan:
- var nodes []bhomebus.NetNode
- nodes = append(nodes, bhomebus.NetNode{})
- if bhSock != nil {
- bhSock.PubTimeout(nodes, LogSaveTopic, data, 1000)
- } else if pubFn != nil {
- pubFn(nodes, LogSaveTopic, data, 1000)
- } else {
- fmt.Println("bhSock nil and pubFn nil")
- }
+ if msg == "" {
+ return
+ }
- default:
- time.Sleep(10*time.Millisecond)
+ log := &ScheduleLog{
+ Timestamp: time.Now().Unix(),
+ ProcName: ProcName,
+ ProcID: ProcID,
+ Level: level,
+ Type: category,
+ Info: msg,
+ }
+
+ deliverLog(log, timeout)
+}
+
+func deliverLog(l LogPrinter, timeout time.Duration) {
+ select {
+ case logCh <- l:
+ return
+ case <-time.After(timeout):
+ var info string
+ b, err := l.Marshal()
+ if nil == err {
+ info = string(b)
}
+ logger.Fatal("SaveScheduleLog failed to save log", info, l.Topic())
}
}
-func Log(userName, method, path, contentType string, body *bytes.Buffer, values url.Values) {
+//func Save(level int, logType int, v ...interface{}) {
+// cache(level, logType, "", "", v)
+//}
+//
+//func SaveManual(level int, logType int, userID string, userName string, v ...interface{}) {
+// cache(level, logType, userID, userName, v)
+//}
+//
+//func cache(level int, logType int, userID string, userName string, fmtArgs []interface{}) {
+// // Format with Sprint, Sprintf, or neither.
+// msg := ""
+// if len(fmtArgs) > 0 {
+// msg = fmt.Sprint(fmtArgs...)
+// }
+// fmt.Println(msg)
+//
+// log := LogInfo {
+// ID: uuid.NewV4().String(),
+// Timestamp: time.Now().Format("2006-01-02 15:04:05"),
+// ProcName: ProcName,
+// ProcID: ProcID,
+// Level: level,
+// Type: logType,
+// UserID: userID,
+// UserName: userName,
+// Info: msg,
+// }
+//
+// data,err := json.Marshal(log)
+// if err != nil {
+// fmt.Println("json.Marshal(log) error:", log)
+// return
+// }
+//
+// msgChan <- data
+//}
+const (
+ OperationLogTopic = "operationLogSaveTopic"
+ ScheduleLogTopic = "scheduleLogSaveTopic"
+)
+
+func saveLoop(logCallback LogReportCallback, wg *sync.WaitGroup, done chan struct{}) {
+ defer wg.Done()
+
+ if nil == logCallback {
+ return
+ }
+
+ for {
+ select {
+ case <- done:
+ return
+ case log := <- logCh:
+ payload, err := log.Marshal()
+ if err != nil {
+ logger.Error("failed to Marshal", log)
+ } else {
+ var nodes []bhome_msg.BHAddress
+ nodes = append(nodes, bhome_msg.BHAddress{})
+
+ reg := &LogRegister {
+ nodes,
+ log.Topic(),
+ payload,
+ }
+
+ logCallback(reg)
+ }
+ }
+ }
}
--
Gitblit v1.8.0