From 076255ec1afa83c00c332541528fc906ba93aa5b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 08 八月 2019 10:14:29 +0800
Subject: [PATCH] ---
---
labelFilter/ruleForLabel.go | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 980fa54..1adf9ce 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -30,7 +30,11 @@
for _, ruleGroup := range allRules {
if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
// 鍏堣繃鏃堕棿瑙勫垯
- timeJudge(label, ruleGroup)
+ timeFlag := timeJudge(label, ruleGroup)
+ if !timeFlag {
+ logger.Info("涓嶅湪瑙勫垯鐨勬椂闂磋寖鍥村唴锛屼笉鎺ㄩ�侊紒")
+ return
+ }
result := ""
var Connector string
if ruleGroup.IsSatisfyAll {
@@ -85,16 +89,16 @@
}
// 鏄惁绗﹀悎鏃堕棿瑙勫垯
-func timeJudge(label *Label, groupRule protomsg.EventPush) string {
+func timeJudge(label *Label, groupRule protomsg.EventPush) bool {
timeNow := time.Now().Format("2006-01-02 15:04:05")
logger.Info("鏍囩杩囨护鍣ㄨ捣濮嬫椂闂翠负锛�",groupRule.TimeStart,groupRule.TimeEnd)
flag1 := isBefore(groupRule.TimeStart, timeNow)
flag2 := isBefore(timeNow, groupRule.TimeEnd)
if flag1 && flag2 {
- return "true"
+ return true
} else {
logger.Info("涓嶅湪瑙勫畾鐨勬椂闂磋寖鍥村唴锛�")
- return "false"
+ return false
}
}
--
Gitblit v1.8.0