From 2c4f305069988a0b1a9a0ece466c6eef286dbfd7 Mon Sep 17 00:00:00 2001
From: yanghui <yanghui@aiotlink.com>
Date: 星期二, 27 四月 2021 10:23:18 +0800
Subject: [PATCH] empty

---
 logc.go |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/logc.go b/logc.go
index 7eddc7e..c08fc81 100644
--- a/logc.go
+++ b/logc.go
@@ -48,12 +48,18 @@
 
 var (
 	opChan chan *OperationLog
-
+	logger *Log
 )
 
 
-func Init(flogWriter LogReportCallback, 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 {
 	opChan = make(chan *OperationLog, 100)
+	if nil != log {
+		logger = log
+	} else {
+		logger = &Log{}
+	}
+
 	//ProcName = procName
 	//ProcID = procId
 
@@ -62,12 +68,27 @@
 	return true
 }
 
-func SaveOperationLog(log *OperationLog) {
-	if nil != log {
-		opChan <- log
+func SaveOperationLog(log *OperationLog, timeout time.Duration) {
+	if nil == log {
+		return
+	}
+
+	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 SaveScheduleLog(category, level int, msg string) {
+
+}
 
 
 //func Save(level int, logType int, v ...interface{}) {
@@ -108,7 +129,7 @@
 //}
 
 const (
-	LogSaveTopic = "logSaveTopic"
+	OperationLogTopic = "operationLogSaveTopic"
 )
 
 func saveLoop(logCallback LogReportCallback, wg *sync.WaitGroup, done  chan struct{}) {
@@ -132,7 +153,7 @@
 
 				reg := &LogRegister {
 					nodes,
-					LogSaveTopic,
+					OperationLogTopic,
 					payload,
 				}
 

--
Gitblit v1.8.0