From da61291c0c526b82c85a1be09234ee4302b098ed Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 04 十一月 2019 13:39:16 +0800
Subject: [PATCH] ---

---
 labelFilter/ruleForLabel.go |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 4da3157..ff0ca13 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -4,6 +4,7 @@
 	"basic.com/dbapi.git"
 	"basic.com/pubsub/protomsg.git"
 	"basic.com/valib/logger.git"
+	"github.com/golang/protobuf/proto"
 	"github.com/knetic/govaluate"
 	"ruleprocess/structure"
 	"strconv"
@@ -16,7 +17,7 @@
 			logger.Error("浜嬩欢鎺ㄩ�佹ā鍧楀効鐨勫紓甯告崟鑾凤細",err)
 		}
 	}()
-
+	start := time.Now()
 	// 瑁呴厤鎴愯嚜宸卞彲浠ヨ瘑鍒殑鏁版嵁
 	label := new(Label)
 	label.DataFormatToLabel(msg)
@@ -82,7 +83,7 @@
 				if result.(bool) {
 					logger.Info("閫氳繃瑙勫垯锛岃〃杈惧紡涓猴細", result)
 					// 鎺ㄩ�佹湇鍔″櫒
-					pushData(ruleGroup.Urls, msg)
+					pushData(ruleGroup.Urls, msg, start)
 					//os.Exit(1)
 				} else {
 					logger.Info("娌¢�氳繃瑙勫垯,琛ㄨ揪寮忎负锛�", result)
@@ -317,11 +318,19 @@
 }
 
 // 璋冪敤鐩爣鏈嶅姟鍣ㄧ殑鎻掑叆鎺ュ彛
-func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
+func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg,start time.Time) {
 	for _, url := range urls {
 		logger.Debug("鐪嬬湅鎺ㄩ�佸湴鍧�锛�",url.Url)
-		urlPool[url.Url] <- data
-		logger.Info("urlPool澶у皬锛� ", len(urlPool[url.Url]))
+		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],time.Since(start))
+		}
+		logger.Info("chan淇℃伅浠ワ細 ", urlPool[url.Url])
+
 	}
 }
 

--
Gitblit v1.8.0