From 355284a3ac944515951d4c2a7ec5d3964fb13857 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 31 十月 2019 13:48:29 +0800
Subject: [PATCH] 把人体追踪从es最前改为放在规则最后

---
 labelFilter/req.go |   55 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/labelFilter/req.go b/labelFilter/req.go
index 1f4be77..19fd392 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -11,10 +11,11 @@
 	"nanomsg.org/go-mangos/transport/ipc"
 	"nanomsg.org/go-mangos/transport/tcp"
 	"ruleprocess/structure"
+	"strings"
 	"time"
 )
 
-var sock mangos.Socket
+
 var urlPool = make(map[string]chan structure.ResultMsg)
 func Die(format string, v ...interface{}) {
 	logger.Info("+++++++",format)
@@ -57,8 +58,29 @@
 
 func Init(){
 
-	var err error
+	var api dbapi.EventPushApi
+	b, allRules := api.FindAllDetails()
+	logger.Info("鍒濆鍖栦簨浠舵帹閫侊紝鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
+	if !b {
+		logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒")
+	}
+	for _, ruleGroup := range allRules {
+		if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
+			for _, url := range ruleGroup.Urls {
+				// 涓烘瘡涓猽rl寤虹珛涓�涓猚han
+				if strings.Contains(url.Url,"114") {
+					urlPool[url.Url] = make(chan structure.ResultMsg)
+					go GoPush(url.Url)
+				}
+			}
+		}
+	}
+}
 
+func GoPush(url string) {
+	var err error
+	var msg []byte
+	var sock mangos.Socket
 	if sock, err = req.NewSocket(); err != nil {
 		Die("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
 	}
@@ -72,28 +94,8 @@
 		logger.Error("鎺ユ敹鍝嶅簲瓒呮椂")
 		return
 	}
-	var api dbapi.EventPushApi
-	b, allRules := api.FindAllDetails()
-	logger.Info("鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
-	if !b {
-		logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒")
-	}
-	for _, ruleGroup := range allRules {
-		if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
-			for _, url := range ruleGroup.Urls {
-				// 涓烘瘡涓猽rl寤虹珛涓�涓猚han
-				urlPool[url.Url] = make(chan structure.ResultMsg,50)
-				go GoPush(url.Url)
-			}
-		}
-	}
-}
-
-func GoPush(url string) {
-	var err error
-	var msg []byte
 	sock.AddTransport(tcp.NewTransport())
-	if err = sock.Dial(url); err != nil {
+	if err = sock.Dial("tcp://"+url); err != nil {
 		logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: ", err.Error())
 	}
 	logger.Info("搴忓垪鍖栨暟鎹�")
@@ -112,19 +114,20 @@
 			logger.Debug("groutine"+url+"鎺ㄩ�佹暟鎹�")
 			//bytes := []byte("ndfasojdfaidsos")
 			if err = sock.Send(bytes); err != nil {
-				Die("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: ", err.Error())
+				Die("groutine"+url+"鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: ", err.Error())
 			}
 			msg, err = sock.Recv();
 			if err != nil {
-				Die("鎺ユ敹鍝嶅簲澶辫触: ", err.Error())
+				Die("groutine"+url+"鎺ユ敹鍝嶅簲澶辫触: ", err.Error())
 			} else {
 				logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒groutine"+url+"鏀跺埌鍝嶅簲",string(msg))
 			}
-			sock.Close()
+
 		default:
 
 		}
 	}
+	sock.Close()
 }
 //func main() {
 //	url := "tcp://192.168.1.123:40011"

--
Gitblit v1.8.0