From 74f6cb6302a6f375f8093650fb601f0d9e432c99 Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期六, 02 十一月 2019 12:45:06 +0800 Subject: [PATCH] --- --- labelFilter/req.go | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/labelFilter/req.go b/labelFilter/req.go index c1c72a2..a105421 100644 --- a/labelFilter/req.go +++ b/labelFilter/req.go @@ -14,8 +14,12 @@ "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) //os.Exit(1) @@ -67,7 +71,9 @@ if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬� for _, url := range ruleGroup.Urls { // 涓烘瘡涓猽rl寤虹珛涓�涓猚han - urlPool[url.Url] = make(chan structure.ResultMsg) + ch := make(chan *structure.ResultMsg,10) + var urlCh = urlChan{url.Url,ch} + urlChans = append(urlChans,urlCh) go GoPush(url.Url) } } @@ -91,18 +97,37 @@ 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()) } 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 + } + } for { select { // case <-ctx.Done(): // return - case data := <- urlPool[url]: - + case data := <- ch: + logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid) bytes,err1 := proto.Marshal(data) logger.Info("鏁版嵁闀垮害涓猴細",len(bytes)) if err1 != nil { -- Gitblit v1.8.0