From e6982607fbbeaa96d3d14409df780266646b793d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 01 十一月 2019 18:22:44 +0800
Subject: [PATCH] 换一个chan
---
labelFilter/req.go | 72 ++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index 7691652..77b7e7c 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -11,11 +11,13 @@
"nanomsg.org/go-mangos/transport/ipc"
"nanomsg.org/go-mangos/transport/tcp"
"ruleprocess/structure"
+ "strings"
"time"
)
-var sock mangos.Socket
+
var urlPool = make(map[string]chan structure.ResultMsg)
+var pool chan *structure.ResultMsg = make(chan *structure.ResultMsg)
func Die(format string, v ...interface{}) {
logger.Info("+++++++",format)
//os.Exit(1)
@@ -57,8 +59,29 @@
func Init(){
- var err error
+ var api dbapi.EventPushApi
+ b, allRules := api.FindAllDetails()
+ logger.Info("鍒濆鍖栦簨浠舵帹閫侊紝鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
+ if !b {
+ logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒")
+ }
+ for _, ruleGroup := range allRules {
+ if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
+ for _, url := range ruleGroup.Urls {
+ // 涓烘瘡涓猽rl寤虹珛涓�涓猚han
+ if strings.Contains(url.Url,"114") {
+ //urlPool[url.Url] = make(chan structure.ResultMsg,10)
+ go GoPush(url.Url)
+ }
+ }
+ }
+ }
+}
+func GoPush(url string) {
+ var err error
+ var msg []byte
+ var sock mangos.Socket
if sock, err = req.NewSocket(); err != nil {
Die("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
}
@@ -72,38 +95,32 @@
logger.Error("鎺ユ敹鍝嶅簲瓒呮椂")
return
}
- var api dbapi.EventPushApi
- b, allRules := api.FindAllDetails()
- logger.Info("鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
- if !b {
- logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒")
+ errWrite := sock.SetOption(mangos.OptionWriteQLen,10)
+ if errWrite != nil {
+ logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
+ return
}
- for _, ruleGroup := range allRules {
- if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
- for _, url := range ruleGroup.Urls {
- // 涓烘瘡涓猽rl寤虹珛涓�涓猚han
- urlPool[url.Url] = make(chan structure.ResultMsg,50)
- go GoPush(url.Url)
- }
- }
+ errRead := sock.SetOption(mangos.OptionReadQLen,10)
+ if errRead != nil {
+ logger.Error("璁剧疆浼犺緭缂撳瓨澶у皬澶辫触")
+ return
}
-}
-
-func GoPush(url string) {
- var err error
- var msg []byte
sock.AddTransport(tcp.NewTransport())
- if err = sock.Dial(url); err != nil {
- logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
+ if err = sock.Dial("tcp://"+url); err != nil {
+ logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: ", err.Error())
}
logger.Info("搴忓垪鍖栨暟鎹�")
+
+ //for v := range pool{
+ // logger.Info("鏃犻檺寰幆",v.Cid)
+ //}
for {
select {
// case <-ctx.Done():
// return
- case data := <- urlPool[url]:
-
+ case data := <- pool:
+ logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid)
bytes,err1 := proto.Marshal(data)
logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
if err1 != nil {
@@ -112,19 +129,20 @@
logger.Debug("groutine"+url+"鎺ㄩ�佹暟鎹�")
//bytes := []byte("ndfasojdfaidsos")
if err = sock.Send(bytes); err != nil {
- Die("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
+ Die("groutine"+url+"鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: ", err.Error())
}
msg, err = sock.Recv();
if err != nil {
- Die("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
+ Die("groutine"+url+"鎺ユ敹鍝嶅簲澶辫触: ", err.Error())
} else {
logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒groutine"+url+"鏀跺埌鍝嶅簲",string(msg))
}
- sock.Close()
+
default:
}
}
+ sock.Close()
}
//func main() {
// url := "tcp://192.168.1.123:40011"
--
Gitblit v1.8.0