From 84aeb755f5a7cb9e6f35a43d2435b0d0a6a66d38 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 03 八月 2019 11:29:23 +0800
Subject: [PATCH] 条件过滤中不涉及时间规则的东西
---
labelFilter/ruleForLabel.go | 91 +++++++++++++++++++++++----------------------
1 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index fe905b2..ccc3cf5 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -19,50 +19,53 @@
}
//閬嶅巻鎵�鏈夌殑瑙勫垯缁勶紝鐪嬬湅绗﹀悎鍝釜瑙勫垯缁勶紝灏辨妸鏁版嵁鎻掑叆鍒板摢涓鍒欑粍鐨勭洰鏍囨満鍣ㄤ笂
for _,ruleGroup := range allRules {
- // 鍏堣繃鏃堕棿瑙勫垯
- timeJudge(label,ruleGroup)
- result := ""
- var Connector string
- if ruleGroup.IsSatisfyAll {
- Connector = "&&"
- } else {
- Connector = "||"
- }
- for _,rule := range ruleGroup.Rules {
- // 杩囨瘡涓�涓皬瑙勫垯
- if rule.TopicType == "camera" {
- result = Connector + cameraJudge(label,rule)
- }
- if rule.TopicType == "baseLibrary" {
- result = Connector + baseJudge(label,rule)
- }
- if rule.TopicType == "task" {
- result = Connector + taskJudge(label,rule)
- }
- if rule.TopicType == "person" {
- result = Connector + taskJudge(label,rule)
- }
- if rule.TopicType == "defence" {
- result = Connector + defenceJudge(label,rule)
- }
- }
- // 寰楀嚭鎬荤殑鍒ゆ柇缁撴灉
- if result != "" {
- result = result[2:] // 鎶婂墠涓や綅瀛楃鍘绘帀
- expression, err:= govaluate.NewEvaluableExpression(result);
- if err != nil {
- logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒")
- }
- result, err1:= expression.Evaluate(nil)
- if err1 != nil {
- logger.Error("甯﹀叆鍙傛暟鏈夎")
- }
- if result.(bool) {
- logger.Info("閫氳繃瑙勫垯锛岃〃杈惧紡涓猴細",result)
- // 鎺ㄩ�佹湇鍔″櫒
- pushData(ruleGroup.IpPorts,result.(ruleserver.ResultMsg))
+ if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
+ // 鍏堣繃鏃堕棿瑙勫垯
+ timeJudge(label,ruleGroup)
+ result := ""
+ var Connector string
+ if ruleGroup.IsSatisfyAll {
+ Connector = "&&"
} else {
- logger.Info("娌￠�氳繃瑙勫垯,琛ㄨ揪寮忎负锛�",result)
+ Connector = "||"
+ }
+ for _,rule := range ruleGroup.Rules {
+ // 杩囨瘡涓�涓皬瑙勫垯
+ if rule.TopicType == "camera" {
+ result = Connector + cameraJudge(label,rule)
+ }
+ if rule.TopicType == "baseLibrary" {
+ result = Connector + baseJudge(label,rule)
+ }
+ if rule.TopicType == "task" {
+ result = Connector + taskJudge(label,rule)
+ }
+ if rule.TopicType == "person" {
+ result = Connector + taskJudge(label,rule)
+ }
+ if rule.TopicType == "defence" {
+ result = Connector + defenceJudge(label,rule)
+ }
+ }
+ // 寰楀嚭鎬荤殑鍒ゆ柇缁撴灉
+ if result != "" {
+ result = result[2:] // 鎶婂墠涓や綅瀛楃鍘绘帀
+ expression, err:= govaluate.NewEvaluableExpression(result);
+ if err != nil {
+ logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒")
+ }
+ result, err1:= expression.Evaluate(nil)
+ if err1 != nil {
+ logger.Error("甯﹀叆鍙傛暟鏈夎")
+ }
+ logger.Warn("瑙勫垯鍒ゆ柇缁撴灉鏄細",)
+ if result.(bool) {
+ logger.Info("閫氳繃瑙勫垯锛岃〃杈惧紡涓猴細",result)
+ // 鎺ㄩ�佹湇鍔″櫒
+ pushData(ruleGroup.Urls,result.(ruleserver.ResultMsg))
+ } else {
+ logger.Info("娌￠�氳繃瑙勫垯,琛ㄨ揪寮忎负锛�",result)
+ }
}
}
}
@@ -187,6 +190,6 @@
return "false"
}
// 璋冪敤鐩爣鏈嶅姟鍣ㄧ殑鎻掑叆鎺ュ彛
-func pushData (urls []*protomsg.PushIpPort, data ruleserver.ResultMsg){
+func pushData (urls []*protomsg.PushUrl, data ruleserver.ResultMsg){
}
\ No newline at end of file
--
Gitblit v1.8.0