From 54796f5e2227764ef21449c2ddb0593d092bd6aa Mon Sep 17 00:00:00 2001
From: yanghui <yanghui@aiotlink.com>
Date: 星期一, 26 四月 2021 17:17:49 +0800
Subject: [PATCH] complete log
---
logc.go | 160 ++++++++++++++++++++++++++---------------------------
1 files changed, 78 insertions(+), 82 deletions(-)
diff --git a/logc.go b/logc.go
index 494c91f..dca99a3 100644
--- a/logc.go
+++ b/logc.go
@@ -4,7 +4,6 @@
"basic.com/valib/bhomebus.git"
"encoding/json"
"fmt"
- uuid "github.com/satori/go.uuid"
"sync"
"time"
)
@@ -48,90 +47,83 @@
type LogReportCallback func(*LogRegister)
var (
- msgChan chan []byte
- //bhSock *bhomebus.Socket
- //pubFn func(nodes []bhomebus.NetNode, topic string, data []byte, milliseconds int) int
- ProcName string
- ProcID string
-
+ opChan chan *OperationLog
+ logger *Log
)
-func Init(flogWriter LogReportCallback, procId string, procName string, wg *sync.WaitGroup, done chan struct{}) bool {
- msgChan = make(chan []byte, 100)
- ProcName = procName
- ProcID = procId
+func Init(flogWriter LogReportCallback, log *Log, procId string, procName string, wg *sync.WaitGroup, done chan struct{}) bool {
+ opChan = make(chan *OperationLog, 100)
+ if nil != log {
+ logger = log
+ } else {
+ logger = &Log{}
+ }
+
+ //ProcName = procName
+ //ProcID = procId
go saveLoop(flogWriter, wg, done)
return true
}
-//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
-// }
-//
-// go saveLoop()
-//
-// 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
+ select {
+ case opChan <- log:
+ return
+ case <-time.After(timeout):
+ var info string
+ b, err := json.Marshal(log)
+ if nil == err {
+ info = string(b)
+ }
+ logger.Fatal("SaveOperationLog failed to save log", info)
+ }
}
+
+
+
+//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 (
LogSaveTopic = "logSaveTopic"
@@ -148,18 +140,22 @@
select {
case <- done:
return
- case data := <- msgChan:
- var nodes []bhomebus.NetNode
- nodes = append(nodes, bhomebus.NetNode{})
+ case data := <- opChan:
+ payload, err := json.Marshal(data)
+ if err != nil {
+ fmt.Println("json.Marshal(operation data) error:", data)
+ } else {
+ var nodes []bhomebus.NetNode
+ nodes = append(nodes, bhomebus.NetNode{})
- reg := &LogRegister {
- nodes,
- LogSaveTopic,
- data,
+ reg := &LogRegister {
+ nodes,
+ LogSaveTopic,
+ payload,
+ }
+
+ logCallback(reg)
}
-
- logCallback(reg)
-
default:
time.Sleep(10*time.Millisecond)
}
--
Gitblit v1.8.0