From e7d3f49f638a961a751540aca76d0f778b0f0d10 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 08 十一月 2019 09:55:39 +0800
Subject: [PATCH] ---

---
 main.go |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/main.go b/main.go
index 895f5bc..f7c05c9 100644
--- a/main.go
+++ b/main.go
@@ -7,20 +7,16 @@
 	"net/http"
 	_ "net/http/pprof"
 	"ruleprocess/insertdata"
+	"ruleprocess/labelFilter"
 	"ruleprocess/structure"
 	"ruleprocess/util"
 	"time"
 
-	//"bufio"
-	//"bytes"
+	"basic.com/valib/logger.git"
 	"flag"
 	"fmt"
 	"github.com/golang/protobuf/proto"
-	"basic.com/valib/logger.git"
-	//"gocv.io/x/gocv"
-	//"image"
-	//"image/color"
-	//"os"
+
 	"ruleprocess/cache"
 	"ruleprocess/ruleserver"
 	"sync"
@@ -62,6 +58,7 @@
 	go cache.Init(initchan, *dbIp, *surveyPort, *pubPort)
 	logger.Info("cache init completed!!!", <-initchan) //dbserver鍒濆鍖栧畬姣�
 	ruleserver.Init()
+	labelFilter.Init()
 	go ruleserver.TimeTicker()
 	go ruleserver.StartServer()
 	nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
@@ -92,21 +89,24 @@
 				//runtime.GOMAXPROCS(runtime.NumCPU())
 				//logger.Debug("浣跨敤鐨刢pu涓暟锛�",runtime.NumCPU())
 				//go func(msg []byte) {
-				logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
-				arg := structure.SdkDatas{}
-				//paramFormat(msg, &arg)
-				start := time.Now()
-				m := paramFormat(msg, &arg)
-				// 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
-				ruleserver.Judge(&arg, &m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
-				// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
-				resultMsg := structure.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
-				logger.Debug("瑙勫垯鍒ゆ柇瀹屾墍鐢ㄦ椂闂达細", time.Since(start))
-				// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
-				insertdata.InsertToEs(resultMsg)
-				logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", time.Since(start))
-				//浜嬩欢鎺ㄩ��
-				//go labelFilter.Judge(resultMsg)
+					logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
+					arg := structure.SdkDatas{}
+					//paramFormat(msg, &arg)
+					start := time.Now()
+					m := paramFormat(msg, &arg)
+					// 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
+					ruleserver.Judge(&arg, &m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
+					// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
+					resultMsg := structure.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
+					ruleserver.GetAttachInfo(resultMsg.SdkMessage)
+					ruleEnd := time.Since(start)
+					logger.Debug("瑙勫垯鍒ゆ柇瀹屾墍鐢ㄦ椂闂达細", ruleEnd)
+					// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
+					insertdata.InsertToEs(resultMsg)
+					esEnd := time.Since(start)
+					logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", esEnd)
+					//浜嬩欢鎺ㄩ��
+					labelFilter.PushSomthing(resultMsg)
 				//}(msg)
 			}
 		}

--
Gitblit v1.8.0