From 516d94938f664e71dd323426221b535d5e92881b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 04 十一月 2019 16:46:28 +0800
Subject: [PATCH] send数据用协程
---
labelFilter/req.go | 73 +++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index 2efa1f1..a178722 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -9,7 +9,6 @@
"nanomsg.org/go-mangos/protocol/req"
"nanomsg.org/go-mangos/transport/ipc"
"nanomsg.org/go-mangos/transport/tcp"
- "strings"
"time"
)
@@ -21,7 +20,7 @@
//}
//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)
}
@@ -71,11 +70,9 @@
if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
for _, url := range ruleGroup.Urls {
// 涓烘瘡涓猽rl寤虹珛涓�涓猚han
-
- if !strings.Contains(url.Url,"116") {
- ch := make(chan []byte,10)
- urlPool[url.Url] = ch
- logger.Info("鍒濆鍖栦俊鎭細",ch,urlPool)
+ if urlPool[url.Url] == nil {
+ urlPool[url.Url] = make(chan []byte,100)
+ logger.Info("鍒濆鍖栦俊鎭細",urlPool)
go GoPush(url.Url)
}
}
@@ -100,16 +97,21 @@
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
- //}
+ 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("tcp://"+url); err != nil {
logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: ", err.Error())
@@ -125,7 +127,7 @@
// ch = v.ch
// }
//}
- //logger.Info("chan淇℃伅锛�",ch)
+ logger.Info("chan淇℃伅锛�",urlPool[url])
for {
select {
// case <-ctx.Done():
@@ -133,22 +135,25 @@
case data := <- urlPool[url]:
//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(data); err != nil {
- Die("groutine"+url+"鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: ", err.Error())
- }
- msg, err = sock.Recv();
- if err != nil {
- Die("groutine"+url+"鎺ユ敹鍝嶅簲澶辫触: ", err.Error())
- } else {
- logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒groutine"+url+"鏀跺埌鍝嶅簲",string(msg))
- }
-
+ go func(data []byte) {
+ logger.Info("鏁版嵁闀垮害涓猴細",len(data))
+ //if err1 != nil {
+ // logger.Info("搴忓垪鍖栧け璐ワ細",err1)
+ //}
+ start := time.Now()
+ logger.Debug("groutine"+url+"鎺ㄩ�佹暟鎹�")
+ //bytes := []byte("ndfasojdfaidsos")
+ if err = sock.Send(data); err != nil {
+ Die("groutine"+url+"鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: ", err.Error())
+ }
+ pushTime := time.Since(start)
+ msg, err = sock.Recv();
+ if err != nil {
+ Die("groutine"+url+"鎺ユ敹鍝嶅簲澶辫触: ", err.Error(),pushTime,time.Since(start))
+ } else {
+ logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒groutine"+url+"鏀跺埌鍝嶅簲",string(msg),pushTime,time.Since(start))
+ }
+ }(data)
default:
}
--
Gitblit v1.8.0