From 7460be0491061d57a33e5ed685a0e8eb578318eb Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 04 十一月 2019 14:42:47 +0800
Subject: [PATCH] ---
---
labelFilter/req.go | 88 ++++++++++++++++++++++---------------------
1 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index 134b642..bb30e63 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -4,25 +4,23 @@
"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"
- "strings"
"time"
)
-var urlChans = make([]urlChan,100)
-type urlChan struct {
- url string
- ch chan *structure.ResultMsg
-}
-var pool chan *structure.ResultMsg = make(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)
}
@@ -72,12 +70,9 @@
if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
for _, url := range ruleGroup.Urls {
// 涓烘瘡涓猽rl寤虹珛涓�涓猚han
-
- if !strings.Contains(url.Url,"116") {
- ch := make(chan *structure.ResultMsg,10)
- logger.Info("鍒濆鍖栦俊鎭細",ch)
- var urlCh = urlChan{url.Url,ch}
- urlChans = append(urlChans,urlCh)
+ if urlPool[url.Url] == nil {
+ urlPool[url.Url] = make(chan []byte,100)
+ logger.Info("鍒濆鍖栦俊鎭細",urlPool)
go GoPush(url.Url)
}
}
@@ -102,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())
@@ -121,34 +121,36 @@
//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淇℃伅锛�",ch)
+ //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 := <- ch:
- logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid)
- bytes,err1 := proto.Marshal(data)
- logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
- if err1 != nil {
- logger.Info("搴忓垪鍖栧け璐ワ細",err1)
- }
+ case data := <- urlPool[url]:
+ //logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid)
+ //bytes,err1 := proto.Marshal(data)
+ logger.Info("鏁版嵁闀垮害涓猴細",len(data))
+ //if err1 != nil {
+ // logger.Info("搴忓垪鍖栧け璐ワ細",err1)
+ //}
+ start := time.Now()
logger.Debug("groutine"+url+"鎺ㄩ�佹暟鎹�")
//bytes := []byte("ndfasojdfaidsos")
- if err = sock.Send(bytes); err != nil {
+ 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())
+ Die("groutine"+url+"鎺ユ敹鍝嶅簲澶辫触: ", err.Error(),pushTime,time.Since(start))
} else {
- logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒groutine"+url+"鏀跺埌鍝嶅簲",string(msg))
+ logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒groutine"+url+"鏀跺埌鍝嶅簲",string(msg),pushTime,time.Since(start))
}
default:
--
Gitblit v1.8.0