From e41df22644371efc13c845e9c21fdf00b8dd5886 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 02 十一月 2019 16:49:01 +0800
Subject: [PATCH] ---
---
labelFilter/ruleForLabel.go | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index ce3fcca..71f30b0 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -4,26 +4,14 @@
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/logger.git"
+ "github.com/golang/protobuf/proto"
"github.com/knetic/govaluate"
- "ruleprocess/ruleserver"
"ruleprocess/structure"
"strconv"
"time"
)
-func PushSomthing (msg structure.ResultMsg) {
- // 濡傛灉鏍囩涓惈鏈夋寔缁椂闂撮娆℃姤璀︾殑timeLabel鐨勮瘽鍒欎笉闇�瑕佽繃浜轰綋杩借釜锛屼笉鐒跺氨娌＄殑鎻掑叆浜�
- fk := ruleserver.TrackOrNot(msg.RuleResult)
- if fk {
- Judge(msg)
- } else {
- flag := ruleserver.BodyIsSame(msg.SdkMessage)
- if !flag {
- Judge(msg)
- }
- }
-}
-func Judge(msg structure.ResultMsg) {
+func PushSomthing(msg structure.ResultMsg) {
defer func() {
if err := recover(); err != nil {
logger.Error("浜嬩欢鎺ㄩ�佹ā鍧楀効鐨勫紓甯告崟鑾凤細",err)
@@ -333,7 +321,12 @@
func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
for _, url := range urls {
logger.Debug("鐪嬬湅鎺ㄩ�佸湴鍧�锛�",url.Url)
- urlPool[url.Url] <- data
+ bytes,err1 := proto.Marshal(data)
+ if err1 != nil {
+ logger.Info("搴忓垪鍖栧け璐ワ細",err1)
+ }
+ urlPool[url.Url] <- bytes
+ logger.Info("urlPool澶у皬锛� ", urlPool[url.Url])
}
}
--
Gitblit v1.8.0