From f11969d42d9b3ec2413950a95004299dcf334884 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 01 十一月 2019 19:47:32 +0800
Subject: [PATCH] 用结构体标记chan
---
labelFilter/req.go | 23 ++++++++++++++++-------
labelFilter/ruleForLabel.go | 8 +++++++-
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index 77b7e7c..ccba8de 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -11,12 +11,16 @@
"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 +73,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)
}
}
}
@@ -114,12 +118,17 @@
//for v := range pool{
// logger.Info("鏃犻檺寰幆",v.Cid)
//}
-
+ var ch chan *structure.ResultMsg
+ for _, v := range urlChans {
+ if v.url == url{
+ ch = v.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))
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 3cce737..f00f31b 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -320,7 +320,13 @@
func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
for _, url := range urls {
logger.Debug("鐪嬬湅鎺ㄩ�佸湴鍧�锛�",url.Url)
- pool <- &data
+ var ch chan *structure.ResultMsg
+ for _, v := range urlChans {
+ if v.url == url.Url{
+ ch = v.ch
+ }
+ }
+ ch <- &data
//logger.Info("urlPool澶у皬锛� ", len(urlPool[url.Url]))
}
}
--
Gitblit v1.8.0