From 0d4a601d5d7bdfeb369b10125f2cbe9a3caff641 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 02 十一月 2019 15:32:01 +0800
Subject: [PATCH] ---
---
labelFilter/req.go | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index 77b7e7c..d6d96fc 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -11,12 +11,14 @@
"nanomsg.org/go-mangos/transport/ipc"
"nanomsg.org/go-mangos/transport/tcp"
"ruleprocess/structure"
- "strings"
"time"
)
-
-var urlPool = make(map[string]chan structure.ResultMsg)
+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)
@@ -69,10 +71,10 @@
if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
for _, url := range ruleGroup.Urls {
// 涓烘瘡涓猽rl寤虹珛涓�涓猚han
- if strings.Contains(url.Url,"114") {
- //urlPool[url.Url] = make(chan structure.ResultMsg,10)
- go GoPush(url.Url)
- }
+ ch := make(chan *structure.ResultMsg,10)
+ var urlCh = urlChan{url.Url,ch}
+ urlChans = append(urlChans,urlCh)
+ go GoPush(url.Url)
}
}
}
@@ -95,16 +97,16 @@
logger.Error("鎺ユ敹鍝嶅簲瓒呮椂")
return
}
- errWrite := sock.SetOption(mangos.OptionWriteQLen,10)
- if errWrite != nil {
- logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
- return
- }
- errRead := sock.SetOption(mangos.OptionReadQLen,10)
- if errRead != nil {
- logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
- return
- }
+ //errWrite := sock.SetOption(mangos.OptionWriteQLen,10)
+ //if errWrite != nil {
+ // logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
+ // return
+ //}
+ //errRead := sock.SetOption(mangos.OptionReadQLen,10)
+ //if errRead != nil {
+ // logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
+ // return
+ //}
sock.AddTransport(tcp.NewTransport())
if err = sock.Dial("tcp://"+url); err != nil {
logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: ", err.Error())
@@ -114,12 +116,18 @@
//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淇℃伅锛�",ch)
for {
select {
// case <-ctx.Done():
// return
- case data := <- pool:
+ case data := <- ch:
logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid)
bytes,err1 := proto.Marshal(data)
logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
--
Gitblit v1.8.0