From 11082e25407ea22361c54787f84d1c1a88a93301 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 04 十一月 2019 11:32:29 +0800
Subject: [PATCH] 测事件推送所用事件

---
 labelFilter/req.go |   71 ++++++++++++++++++++++++++---------
 1 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/labelFilter/req.go b/labelFilter/req.go
index b61af43..d58fc81 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -4,20 +4,23 @@
 	"basic.com/dbapi.git"
 	"basic.com/valib/logger.git"
 	"fmt"
-	"github.com/golang/protobuf/proto"
 	"nanomsg.org/go-mangos"
 	"nanomsg.org/go-mangos/protocol/rep"
 	"nanomsg.org/go-mangos/protocol/req"
 	"nanomsg.org/go-mangos/transport/ipc"
 	"nanomsg.org/go-mangos/transport/tcp"
-	"ruleprocess/structure"
 	"time"
 )
 
-var sock mangos.Socket
-var urlPool = make(map[string]chan structure.ResultMsg)
+var urlPool = make(map[string]chan []byte,100)
+//var urlChans = make([]urlChan,100)
+//type urlChan struct {
+//	url string
+//	ch chan *structure.ResultMsg
+//}
+//var pool chan *structure.ResultMsg = make(chan *structure.ResultMsg)
 func Die(format string, v ...interface{}) {
-	logger.Info("+++++++",format)
+	logger.Info("+++++++",format,v)
 	//os.Exit(1)
 }
 
@@ -59,7 +62,7 @@
 
 	var api dbapi.EventPushApi
 	b, allRules := api.FindAllDetails()
-	logger.Info("鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
+	logger.Info("鍒濆鍖栦簨浠舵帹閫侊紝鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
 	if !b {
 		logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒")
 	}
@@ -67,8 +70,11 @@
 		if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
 			for _, url := range ruleGroup.Urls {
 				// 涓烘瘡涓猽rl寤虹珛涓�涓猚han
-				urlPool[url.Url] = make(chan structure.ResultMsg,50)
-				go GoPush(url.Url)
+				if urlPool[url.Url] == nil {
+					urlPool[url.Url] = make(chan []byte,10)
+					logger.Info("鍒濆鍖栦俊鎭細",urlPool)
+					go GoPush(url.Url)
+				}
 			}
 		}
 	}
@@ -77,6 +83,7 @@
 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())
 	}
@@ -90,39 +97,65 @@
 		logger.Error("鎺ユ敹鍝嶅簲瓒呮椂")
 		return
 	}
+	errTimeOut1 := sock.SetOption(mangos.OptionSendDeadline,time.Millisecond * 2000)
+	if errTimeOut1 != nil {
+		logger.Error("鍙戦�佽秴鏃�")
+		return
+	}
+	errWrite := sock.SetOption(mangos.OptionWriteQLen,5)
+	if errWrite != nil {
+		logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
+		return
+	}
+	errRead := sock.SetOption(mangos.OptionReadQLen,5)
+	if errRead != nil {
+		logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
+		return
+	}
 	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("搴忓垪鍖栨暟鎹�")
 
+	//for v := range pool{
+	//	logger.Info("鏃犻檺寰幆",v.Cid)
+	//}
+	//var ch chan *structure.ResultMsg
+	//for _, v := range urlChans  {
+	//	if v.url == url{
+	//		ch = v.ch
+	//	}
+	//}
+	logger.Info("chan淇℃伅锛�",urlPool[url])
 	for {
 		select {
 		// case <-ctx.Done():
 		// 	return
 		case data := <- urlPool[url]:
-
-			bytes,err1 := proto.Marshal(data)
-			logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
-			if err1 != nil {
-				logger.Info("搴忓垪鍖栧け璐ワ細",err1)
-			}
+			//logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid)
+			//bytes,err1 := proto.Marshal(data)
+			logger.Info("鏁版嵁闀垮害涓猴細",len(data))
+			//if err1 != nil {
+			//	logger.Info("搴忓垪鍖栧け璐ワ細",err1)
+			//}
 			logger.Debug("groutine"+url+"鎺ㄩ�佹暟鎹�")
 			//bytes := []byte("ndfasojdfaidsos")
-			if err = sock.Send(bytes); err != nil {
-				Die("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: ", err.Error())
+			if err = sock.Send(data); err != nil {
+				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