From 4146578720878b47a3d9d9d2833f1893ae80a032 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 27 九月 2019 14:11:12 +0800
Subject: [PATCH] logger改用公共库
---
ruleserver/timeTicker.go | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index 2449663..218979e 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -2,6 +2,7 @@
import (
"fmt"
+ "basic.com/valib/logger.git"
"ruleprocess/logger"
"strings"
"time"
@@ -32,8 +33,6 @@
}
func TimeTicker() {
- //logger.Info("瀹氭椂鍣ㄦ墽琛屼簡")
- //fmt.Println("瀹氭椂鍣ㄦ墽琛屼簡")
ticker := time.NewTicker(1 * time.Second)
go func(ticker *time.Ticker) {
defer ticker.Stop()
@@ -43,6 +42,7 @@
logger.Info("瀹氭椂鍣ㄦ墽琛屽崟鍏�", time.Now().Unix())
fmt.Println("瀹氭椂鍣ㄦ墽琛屽崟鍏�", time.Now().Unix())
// 姣忕閽熻鏁板櫒姹犲瓙閲屾墍鏈夌殑璁℃暟鍣ㄥ厓绱犻兘鍑忎竴锛屽噺鍒�0鐨勬槸璇ユ姤璀︾殑
+ rw.Lock()
for k, timeEle := range TimeEleList {
if timeEle.N > 0 {
timeEle.N = timeEle.N - 1
@@ -53,6 +53,7 @@
delete(TimeEleList, k)
}
}
+ rw.Unlock()
case stop := <-stopChan:
if stop {
logger.Info("瀹氭椂鍣ㄧ粨鏉�")
@@ -73,6 +74,7 @@
var flagTime string //
// 鍒ゆ柇鏈夋棤姝よ鍒欑粍鐨勫畾鏃跺櫒
flag := false
+ rw.Lock()
for k, _ := range TimeEleList {
//logger.Debug("-----------------鐪嬬湅杩欎釜key鍜実roupId", k, groupId)
if strings.Contains(k, groupId) && k != groupId{
@@ -115,10 +117,12 @@
delete(TimeEleList, k)
} else {
if timeEle.BufferFlag > 0 {
+ logger.Debug("缂撳啿鍖哄噺鍑�")
timeEle.BufferFlag--
}
}
} else {
+ logger.Debug("-----------缁撴灉涓哄亣涓斾笉鍒�0锛屾潃姝诲畾鏃跺櫒")
delete(TimeEleList, k)
}
}
@@ -132,6 +136,7 @@
flagTime = "00"
}
}
+ rw.Unlock()
return flagTime
}
--
Gitblit v1.8.0