From a5dec478e435f4fd1662c651c9904c0648da5655 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 05 十二月 2019 19:44:46 +0800
Subject: [PATCH] ants协程数量100改为20
---
labelFilter/req.go | 99 +++++++++++++++++++++++++------------------------
1 files changed, 50 insertions(+), 49 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index af65097..6642b7b 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -2,22 +2,25 @@
import (
"basic.com/dbapi.git"
- "basic.com/valib/logger.git"
+ logger "github.com/alecthomas/log4go"
"fmt"
"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 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)
}
@@ -59,7 +62,7 @@
var api dbapi.EventPushApi
b, allRules := api.FindAllDetails()
- logger.Info("鍒濆鍖栦簨浠舵帹閫侊紝鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
+ //logger.Info("鍒濆鍖栦簨浠舵帹閫侊紝鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
if !b {
logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒")
}
@@ -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,100)
+ //logger.Info("鍒濆鍖栦俊鎭細",urlPool)
go GoPush(url.Url)
- return
}
}
}
@@ -78,69 +81,67 @@
}
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())
}
errSize := sock.SetOption(mangos.OptionMaxRecvSize,30*1024*1024)
if errSize != nil {
- logger.Error("浼犺緭鐨勬暟鎹秴杩囧ぇ灏忛檺鍒�")
+ _ = logger.Error("浼犺緭鐨勬暟鎹秴杩囧ぇ灏忛檺鍒�")
return
}
- errTimeOut := sock.SetOption(mangos.OptionRecvDeadline,time.Millisecond * 2000)
+ errTimeOut := sock.SetOption(mangos.OptionRecvDeadline,time.Millisecond * 1500)
if errTimeOut != nil {
- logger.Error("鎺ユ敹鍝嶅簲瓒呮椂")
+ _ = logger.Error("鎺ユ敹鍝嶅簲瓒呮椂")
return
}
- errWrite := sock.SetOption(mangos.OptionWriteQLen,10)
+ errTimeOut1 := sock.SetOption(mangos.OptionSendDeadline,time.Millisecond * 1500)
+ if errTimeOut1 != nil {
+ _ = logger.Error("鍙戦�佽秴鏃�")
+ return
+ }
+ errWrite := sock.SetOption(mangos.OptionWriteQLen,5)
if errWrite != nil {
- logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
+ _ = logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
return
}
- errRead := sock.SetOption(mangos.OptionReadQLen,10)
+ errRead := sock.SetOption(mangos.OptionReadQLen,5)
if errRead != nil {
- logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
+ _ = logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
return
}
sock.AddTransport(tcp.NewTransport())
if err = sock.Dial("tcp://"+url); err != nil {
- logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: ", err.Error())
+ _ = logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: ", err.Error())
}
logger.Info("搴忓垪鍖栨暟鎹�")
- for v := range urlPool[url]{
- logger.Info(v)
- }
+ for {
+ select {
+ // case <-ctx.Done():
+ // return
+ case data := <- urlPool[url]:
- //for {
- // select {
- // // case <-ctx.Done():
- // // return
- // case data := <- urlPool[url]:
- // logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid)
- // //bytes,err1 := proto.Marshal(data)
- // //logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
- // //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))
- // //}
- //
- // default:
- //
- // }
- //}
+ go func(data []byte) {
+ start := time.Now()
+ 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:
+ time.Sleep(time.Millisecond * 10)
+ }
+ }
sock.Close()
}
//func main() {
--
Gitblit v1.8.0