From ac8aa9785bc3c31afb7eb5a430efdf45cf9dccc3 Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期六, 13 七月 2019 15:24:41 +0800 Subject: [PATCH] 修改定时器的缓存结果标签 --- ruleserver/timeTicker.go | 49 ++++++++++--------------------------------------- 1 files changed, 10 insertions(+), 39 deletions(-) diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go index cd6ad55..c119195 100644 --- a/ruleserver/timeTicker.go +++ b/ruleserver/timeTicker.go @@ -13,11 +13,12 @@ // 瀹氭椂鍣ㄥ厓绱� type TimeElement struct { - N int // 鎸夋椂闂翠緷娆¢�掑噺鐨勫綋鍓嶅�� - InitN int // 璧嬪�煎悗灏变笉鍙樼殑鍒濆鍊� - AlarmFlag bool // 鎶ヨ鏍囧織浣� 瀹氭椂鍣ㄥ紑鍚悗绗竴娆℃姤璀︽椂浼氳缃负true 寰�鍚庡啀鏉ユ姤璀︿篃涓嶄細鎻掕繘ES - CacheSdkData SdkDatas // 瀹氭椂鍣ㄧ殑缂撳瓨鏁版嵁 鎸佺画鏃堕棿绫荤殑寮�鍚畾鏃跺櫒鏃惰缂撳瓨涓�甯� - GroupId string // 鑱斿姩瑙勫垯闇�瑕佽褰曚笅姝ゆ椂鐨勮鍒欑粍id + N int // 鎸夋椂闂翠緷娆¢�掑噺鐨勫綋鍓嶅�� + InitN int // 璧嬪�煎悗灏变笉鍙樼殑鍒濆鍊� + BufferFlag int // 缂撳啿瀹归敊浣� 杩炵画甯alse鎵嶄负false + AlarmFlag bool // 鎶ヨ鏍囧織浣� 瀹氭椂鍣ㄥ紑鍚悗绗竴娆℃姤璀︽椂浼氳缃负true 寰�鍚庡啀鏉ユ姤璀︿篃涓嶄細鎻掕繘ES + CacheSdkData ResultMsg // 瀹氭椂鍣ㄧ殑缂撳瓨鏁版嵁 鎸佺画鏃堕棿绫荤殑寮�鍚畾鏃跺櫒鏃惰缂撳瓨涓�甯� + GroupId string // 鑱斿姩瑙勫垯闇�瑕佽褰曚笅姝ゆ椂鐨勮鍒欑粍id RuleResults []*RuleResult } type RuleResult struct { @@ -43,11 +44,11 @@ for k, timeEle := range TimeEleList { if timeEle.N > 0 { timeEle.N = timeEle.N - 1 - logger.Info("-------------------------------------鎵撳嵃瀹氭椂鍣ㄥ厓绱犲綋鍓嶅��-----------------------------------------锛�", timeEle.N) + logger.Error("-------------------------------------鎵撳嵃瀹氭椂鍣ㄥ厓绱犲綋鍓嶅��-----------------------------------------锛�", timeEle.N) } - if timeEle.GroupId != "" && timeEle.N == 0{ - // 璇存槑鏄仈鍔ㄤ换鍔$殑鏃堕棿绐楀彛 鍒扮偣鍎夸簡璇ラ攢姣佷簡,鍐嶆潵浜嗗啀寮�鍚� - delete(TimeEleList,k) + if timeEle.GroupId != "" && timeEle.N == 0 { + // 璇存槑鏄仈鍔ㄤ换鍔$殑鏃堕棿绐楀彛 鍒扮偣鍎夸簡璇ラ攢姣佷簡,鍐嶆潵浜嗗啀鍒涘缓 + delete(TimeEleList, k) } } case stop := <-stopChan: @@ -64,36 +65,6 @@ stopChan <- true TimeTicker() } - -// 瀹氭椂鍣ㄥ崟鍏� 搴熷純鐗堟湰 -// func TimeTicker() chan bool { -// logger.Info("鎵ц浜唗imeTicker") -// ticker := time.NewTicker(1 * time.Second) -// stopChan := make(chan bool) -// go func(ticker *time.Ticker) { -// defer ticker.Stop() -// for { -// select { -// case <-ticker.C: -// //logger.Info("鎵ц鍗曞厓", "璁℃暟鍣ㄩ泦鍚�2", TimeEleList) -// for k, timeEle := range TimeEleList { -// timeEle.n = timeEle.n - 1 -// //logger.Info("閬嶅巻鐨勬暟鍊�", TimeEleList) -// if timeEle.n == 0 { -// // do something alarm -// alarm(k, timeEle) -// } -// } -// case stop := <-stopChan: -// if stop { -// logger.Info("瀹氭椂鍣ㄧ粨鏉�") -// return -// } -// } -// } -// }(ticker) -// return stopChan -// } // 缁撴瀯浣撴牴鎹煇瀛楁鎺掑簭 type SubList []*RuleResult -- Gitblit v1.8.0