From b2f549332f6f890b252c3cc6abcbd35fdc6ae2e5 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 09 七月 2019 11:09:08 +0800
Subject: [PATCH] 调整配置文件的引用位置
---
ruleserver/timeTicker.go | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go
index 27b553c..feed196 100644
--- a/ruleserver/timeTicker.go
+++ b/ruleserver/timeTicker.go
@@ -2,7 +2,7 @@
import (
"fmt"
- "os"
+ "ruleprocess/logger"
"time"
)
@@ -27,6 +27,7 @@
}
func TimeTicker() {
+ logger.Info("瀹氭椂鍣ㄦ墽琛屼簡")
fmt.Println("瀹氭椂鍣ㄦ墽琛屼簡")
ticker := time.NewTicker(1 * time.Second)
go func(ticker *time.Ticker) {
@@ -34,17 +35,20 @@
for {
select {
case <-ticker.C:
- fmt.Println("瀹氭椂鍣ㄦ墽琛屽崟鍏�")
+ logger.Info("瀹氭椂鍣ㄦ墽琛屽崟鍏�",time.Now().Unix())
+ fmt.Println("瀹氭椂鍣ㄦ墽琛屽崟鍏�",time.Now().Unix())
// 姣忕閽熻鏁板櫒姹犲瓙閲屾墍鏈夌殑璁℃暟鍣ㄥ厓绱犻兘鍑忎竴锛屽噺鍒�0鐨勬槸璇ユ姤璀︾殑
for _, timeEle := range TimeEleList {
if timeEle.N > 0 {
timeEle.N = timeEle.N - 1
+ logger.Info("-------------------------------------鎵撳嵃瀹氭椂鍣ㄥ厓绱犲綋鍓嶅��-----------------------------------------锛�",timeEle.N)
}
}
case stop := <-stopChan:
if stop {
- fmt.Println("瀹氭椂鍣ㄧ粨鏉�")
- os.Exit(0)
+ logger.Info("瀹氭椂鍣ㄧ粨鏉�")
+ return
+ //os.Exit(0)
}
}
}
@@ -57,7 +61,7 @@
// 瀹氭椂鍣ㄥ崟鍏� 搴熷純鐗堟湰
// func TimeTicker() chan bool {
-// fmt.Println("鎵ц浜唗imeTicker")
+// logger.Info("鎵ц浜唗imeTicker")
// ticker := time.NewTicker(1 * time.Second)
// stopChan := make(chan bool)
// go func(ticker *time.Ticker) {
@@ -65,10 +69,10 @@
// for {
// select {
// case <-ticker.C:
-// //fmt.Println("鎵ц鍗曞厓", "璁℃暟鍣ㄩ泦鍚�2", TimeEleList)
+// //logger.Info("鎵ц鍗曞厓", "璁℃暟鍣ㄩ泦鍚�2", TimeEleList)
// for k, timeEle := range TimeEleList {
// timeEle.n = timeEle.n - 1
-// //fmt.Println("閬嶅巻鐨勬暟鍊�", TimeEleList)
+// //logger.Info("閬嶅巻鐨勬暟鍊�", TimeEleList)
// if timeEle.n == 0 {
// // do something alarm
// alarm(k, timeEle)
@@ -76,7 +80,7 @@
// }
// case stop := <-stopChan:
// if stop {
-// fmt.Println("瀹氭椂鍣ㄧ粨鏉�")
+// logger.Info("瀹氭椂鍣ㄧ粨鏉�")
// return
// }
// }
@@ -85,8 +89,17 @@
// return stopChan
// }
+// 缁撴瀯浣撴牴鎹煇瀛楁鎺掑簭
type SubList []*RuleResult
func (p SubList) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
func (p SubList) Len() int { return len(p) }
func (p SubList) Less(i, j int) bool { return p[i].Sort < p[j].Sort }
+
+// 缁撴瀯浣撴牴鎹煇瀛楁鎺掑簭
+type resultList []*LittleRuleResult
+
+func (p resultList) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
+func (p resultList) Len() int { return len(p) }
+func (p resultList) Less(i, j int) bool { return p[i].Sort < p[j].Sort }
+
--
Gitblit v1.8.0