From 88e40c9d693ef89bde3e0d841054b017c195d5b8 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 30 十月 2019 19:39:57 +0800
Subject: [PATCH] 修正事件推送
---
labelFilter/ruleForLabel.go | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index ea8d3ae..7c10a15 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -3,14 +3,19 @@
import (
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
- "github.com/knetic/govaluate"
"basic.com/valib/logger.git"
- "ruleprocess/ruleserver"
+ "github.com/knetic/govaluate"
+ "ruleprocess/structure"
"strconv"
"time"
)
-func Judge(msg ruleserver.ResultMsg) {
+func Judge(msg structure.ResultMsg) {
+ defer func() {
+ if err := recover(); err != nil {
+ logger.Error("浜嬩欢鎺ㄩ�佹ā鍧楀効鐨勫紓甯告崟鑾凤細",err)
+ }
+ }()
// 瑁呴厤鎴愯嚜宸卞彲浠ヨ瘑鍒殑鏁版嵁
label := new(Label)
label.DataFormatToLabel(msg)
@@ -33,7 +38,7 @@
timeFlag := timeJudge(label, ruleGroup)
if !timeFlag {
logger.Info("涓嶅湪瑙勫垯鐨勬椂闂磋寖鍥村唴锛屼笉鎺ㄩ�侊紒")
- return
+ continue
}
result := ""
var Connector string
@@ -311,10 +316,10 @@
}
// 璋冪敤鐩爣鏈嶅姟鍣ㄧ殑鎻掑叆鎺ュ彛
-func pushData(urls []*protomsg.PushUrl, data ruleserver.ResultMsg) {
+func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
for _, url := range urls {
logger.Debug("鐪嬬湅鎺ㄩ�佸湴鍧�锛�",url.Url)
- Push("tcp://192.168.1.123:40012", data)
+ urlPool[url.Url] <- data
}
}
--
Gitblit v1.8.0