From 6e8ebf781ac457b7ec77f7e4c9ade4c3d36002bc Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 18:42:05 +0800
Subject: [PATCH] merge master
---
labelFilter/req.go | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index d58fc81..b04a123 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -4,11 +4,13 @@
"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"
)
@@ -71,7 +73,7 @@
for _, url := range ruleGroup.Urls {
// 涓烘瘡涓猽rl寤虹珛涓�涓猚han
if urlPool[url.Url] == nil {
- urlPool[url.Url] = make(chan []byte,10)
+ urlPool[url.Url] = make(chan []byte,100)
logger.Info("鍒濆鍖栦俊鎭細",urlPool)
go GoPush(url.Url)
}
@@ -81,6 +83,7 @@
}
func GoPush(url string) {
+
var err error
var msg []byte
var sock mangos.Socket
@@ -92,12 +95,12 @@
logger.Error("浼犺緭鐨勬暟鎹秴杩囧ぇ灏忛檺鍒�")
return
}
- errTimeOut := sock.SetOption(mangos.OptionRecvDeadline,time.Millisecond * 2000)
+ errTimeOut := sock.SetOption(mangos.OptionRecvDeadline,time.Millisecond * 1500)
if errTimeOut != nil {
logger.Error("鎺ユ敹鍝嶅簲瓒呮椂")
return
}
- errTimeOut1 := sock.SetOption(mangos.OptionSendDeadline,time.Millisecond * 2000)
+ errTimeOut1 := sock.SetOption(mangos.OptionSendDeadline,time.Millisecond * 1500)
if errTimeOut1 != nil {
logger.Error("鍙戦�佽秴鏃�")
return
@@ -135,22 +138,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