From da61291c0c526b82c85a1be09234ee4302b098ed Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 04 十一月 2019 13:39:16 +0800
Subject: [PATCH] ---
---
labelFilter/req.go | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index 5403bd3..09658cf 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -9,15 +9,18 @@
"nanomsg.org/go-mangos/protocol/req"
"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 urlPool = make(map[string]chan []byte,100)
+//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)
+ logger.Info("+++++++",format,v)
//os.Exit(1)
}
@@ -67,10 +70,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)
+ if urlPool[url.Url] == nil {
+ urlPool[url.Url] = make(chan []byte,10)
+ logger.Info("鍒濆鍖栦俊鎭細",urlPool)
go GoPush(url.Url)
- return
}
}
}
@@ -79,7 +82,7 @@
func GoPush(url string) {
var err error
- //var msg []byte
+ var msg []byte
var sock mangos.Socket
if sock, err = req.NewSocket(); err != nil {
Die("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
@@ -94,12 +97,17 @@
logger.Error("鎺ユ敹鍝嶅簲瓒呮椂")
return
}
- errWrite := sock.SetOption(mangos.OptionWriteQLen,10)
+ 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,10)
+ errRead := sock.SetOption(mangos.OptionReadQLen,5)
if errRead != nil {
logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
return
@@ -110,28 +118,39 @@
}
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
+ // }
+ //}
+ logger.Info("chan淇℃伅锛�",urlPool[url])
for {
select {
// case <-ctx.Done():
// return
case data := <- urlPool[url]:
- logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid)
+ //logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid)
//bytes,err1 := proto.Marshal(data)
- //logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
+ logger.Info("鏁版嵁闀垮害涓猴細",len(data))
//if err1 != nil {
// logger.Info("搴忓垪鍖栧け璐ワ細",err1)
//}
- //logger.Debug("groutine"+url+"鎺ㄩ�佹暟鎹�")
- ////bytes := []byte("ndfasojdfaidsos")
- //if err = sock.Send(bytes); 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))
- //}
+ start := time.Now()
+ 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(),time.Since(start))
+ } else {
+ logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒groutine"+url+"鏀跺埌鍝嶅簲",string(msg),time.Since(start))
+ }
default:
--
Gitblit v1.8.0