From 3f5e966a8331186b9c30cc82836c64fa9a917551 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 05 七月 2019 15:40:26 +0800
Subject: [PATCH] ---
---
logger/logger.go | 2 +-
ruleserver/ruleToformula.go | 2 +-
ruleserver/timeTicker.go | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/logger/logger.go b/logger/logger.go
index 72314ff..73b919c 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -116,7 +116,7 @@
}
}
-func Fatalf(args ...interface{}) {
+func Fatal(args ...interface{}) {
if logFile.level >= FatalLevel {
log.SetPrefix(red(fatalPrefix))
_ = log.Output(2, fmt.Sprintln(args...))
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index ab46a3a..8cefa9e 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -233,7 +233,7 @@
logger.Error("姣斿瑙勫垯鏈夎", err.(string))
}
}()
- logger.Warn("+++++++++++瑙勫垯寮�濮嬭繍琛�+++++++++++++++++褰撳墠瑙勫垯--锛�", *groupRule)
+ logger.Info("+++++++++++瑙勫垯寮�濮嬭繍琛�+++++++++++++++++褰撳墠瑙勫垯--锛�", *groupRule)
resultSplice := []*LittleRuleResult{}
// 鍏堣繃瀹屾潯浠惰鍒�
for j := 0; j < len(groupRule.Rules); j++ {
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index d172a5b..9cafffb 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -2,6 +2,7 @@
import (
"fmt"
+ "os"
"ruleprocess/logger"
"time"
)
@@ -35,8 +36,8 @@
for {
select {
case <-ticker.C:
- logger.Info("瀹氭椂鍣ㄦ墽琛屽崟鍏�")
- fmt.Println("瀹氭椂鍣ㄦ墽琛屽崟鍏�")
+ logger.Info("瀹氭椂鍣ㄦ墽琛屽崟鍏�",time.Now().Unix())
+ fmt.Println("瀹氭椂鍣ㄦ墽琛屽崟鍏�",time.Now().Unix())
// 姣忕閽熻鏁板櫒姹犲瓙閲屾墍鏈夌殑璁℃暟鍣ㄥ厓绱犻兘鍑忎竴锛屽噺鍒�0鐨勬槸璇ユ姤璀︾殑
for _, timeEle := range TimeEleList {
if timeEle.N > 0 {
@@ -47,7 +48,7 @@
case stop := <-stopChan:
if stop {
logger.Info("瀹氭椂鍣ㄧ粨鏉�")
- //os.Exit(0)
+ os.Exit(0)
}
}
}
--
Gitblit v1.8.0