From 23c837bc4d5b4312c0bb5eb96260c90e887882ac Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 15:10:23 +0800
Subject: [PATCH] git add .
---
labelFilter/ruleForLabel.go | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index df28b40..e8b0193 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -3,14 +3,21 @@
import (
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
+ "basic.com/valib/logger.git"
+ "github.com/golang/protobuf/proto"
"github.com/knetic/govaluate"
- "ruleprocess/logger"
- "ruleprocess/ruleserver"
+ "ruleprocess/structure"
"strconv"
"time"
)
-func Judge(msg ruleserver.ResultMsg) {
+func PushSomthing(msg structure.ResultMsg) {
+ defer func() {
+ if err := recover(); err != nil {
+ logger.Error("浜嬩欢鎺ㄩ�佹ā鍧楀効鐨勫紓甯告崟鑾凤細",err)
+ }
+ }()
+ start := time.Now()
// 瑁呴厤鎴愯嚜宸卞彲浠ヨ瘑鍒殑鏁版嵁
label := new(Label)
label.DataFormatToLabel(msg)
@@ -33,7 +40,7 @@
timeFlag := timeJudge(label, ruleGroup)
if !timeFlag {
logger.Info("涓嶅湪瑙勫垯鐨勬椂闂磋寖鍥村唴锛屼笉鎺ㄩ�侊紒")
- return
+ continue
}
result := ""
var Connector string
@@ -77,6 +84,7 @@
logger.Info("閫氳繃瑙勫垯锛岃〃杈惧紡涓猴細", result)
// 鎺ㄩ�佹湇鍔″櫒
pushData(ruleGroup.Urls, msg)
+ logger.Info("鏃堕棿鎺ㄩ�佹墍鐢ㄦ椂闂达細",time.Since(start))
//os.Exit(1)
} else {
logger.Info("娌￠�氳繃瑙勫垯,琛ㄨ揪寮忎负锛�", result)
@@ -311,11 +319,21 @@
}
// 璋冪敤鐩爣鏈嶅姟鍣ㄧ殑鎻掑叆鎺ュ彛
-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)
+ bytes,err1 := proto.Marshal(data)
+ if err1 != nil {
+ logger.Info("搴忓垪鍖栧け璐ワ細",err1)
+ }
+ if _, ok := urlPool[url.Url] ; ok {
+ urlPool[url.Url] <- bytes
+ logger.Info("chan淇℃伅鑰岋細 ", urlPool[url.Url])
+ }
+ logger.Info("chan淇℃伅浠ワ細 ", urlPool[url.Url])
+
}
+
}
// 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧
--
Gitblit v1.8.0