From 52713b8d85e26a984ecaeef926c815e8cf8075b7 Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期四, 07 十一月 2019 19:24:17 +0800 Subject: [PATCH] --- --- ruleserver/timeTicker.go | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ruleserver/timeTicker.go b/ruleserver/timeTicker.go index 3d258e8..f42f3a2 100644 --- a/ruleserver/timeTicker.go +++ b/ruleserver/timeTicker.go @@ -34,35 +34,35 @@ func TimeTicker() { ticker := time.NewTicker(1 * time.Second) - go func(ticker *time.Ticker) { - defer ticker.Stop() - for { - select { - case <-ticker.C: - 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 - logger.Error("-------------------------------------鎵撳嵃瀹氭椂鍣ㄨ鏁板厓绱犲綋鍓嶅��-----------------------------------------锛�", timeEle.N) - } - if timeEle.GroupId != "" && timeEle.N == 0 { - // 璇存槑鏄仈鍔ㄤ换鍔$殑鏃堕棿绐楀彛 鍒扮偣鍎夸簡璇ラ攢姣佷簡,鍐嶆潵浜嗗啀鍒涘缓 - delete(TimeEleList, k) - } + //go func(ticker *time.Ticker) { + defer ticker.Stop() + for { + select { + case <-ticker.C: + 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 + logger.Error("-------------------------------------鎵撳嵃瀹氭椂鍣ㄨ鏁板厓绱犲綋鍓嶅��-----------------------------------------锛�", timeEle.N) } - rw.Unlock() - case stop := <-stopChan: - if stop { - logger.Info("瀹氭椂鍣ㄧ粨鏉�") - return - //os.Exit(0) + if timeEle.GroupId != "" && timeEle.N == 0 { + // 璇存槑鏄仈鍔ㄤ换鍔$殑鏃堕棿绐楀彛 鍒扮偣鍎夸簡璇ラ攢姣佷簡,鍐嶆潵浜嗗啀鍒涘缓 + delete(TimeEleList, k) } } + rw.Unlock() + case stop := <-stopChan: + if stop { + logger.Info("瀹氭椂鍣ㄧ粨鏉�") + return + //os.Exit(0) + } } - }(ticker) + } + //}(ticker) } func StopTimeTicker() { stopChan <- true -- Gitblit v1.8.0