From f11969d42d9b3ec2413950a95004299dcf334884 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 01 十一月 2019 19:47:32 +0800
Subject: [PATCH] 用结构体标记chan
---
labelFilter/req.go | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index b61af43..ccba8de 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -14,8 +14,14 @@
"time"
)
-var sock mangos.Socket
+
var urlPool = make(map[string]chan structure.ResultMsg)
+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)
//os.Exit(1)
@@ -59,7 +65,7 @@
var api dbapi.EventPushApi
b, allRules := api.FindAllDetails()
- logger.Info("鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
+ logger.Info("鍒濆鍖栦簨浠舵帹閫侊紝鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
if !b {
logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒")
}
@@ -67,7 +73,9 @@
if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
for _, url := range ruleGroup.Urls {
// 涓烘瘡涓猽rl寤虹珛涓�涓猚han
- urlPool[url.Url] = make(chan structure.ResultMsg,50)
+ ch := make(chan *structure.ResultMsg,10)
+ var urlCh = urlChan{url.Url,ch}
+ urlChans = append(urlChans,urlCh)
go GoPush(url.Url)
}
}
@@ -77,6 +85,7 @@
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())
}
@@ -90,18 +99,37 @@
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
+ }
sock.AddTransport(tcp.NewTransport())
- if err = sock.Dial(url); err != nil {
+ if err = sock.Dial("tcp://"+url); err != nil {
logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: ", err.Error())
}
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
+ }
+ }
for {
select {
// case <-ctx.Done():
// return
- case data := <- urlPool[url]:
-
+ case data := <- ch:
+ logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid)
bytes,err1 := proto.Marshal(data)
logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
if err1 != nil {
@@ -110,19 +138,20 @@
logger.Debug("groutine"+url+"鎺ㄩ�佹暟鎹�")
//bytes := []byte("ndfasojdfaidsos")
if err = sock.Send(bytes); err != nil {
- Die("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: ", err.Error())
+ Die("groutine"+url+"鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: ", err.Error())
}
msg, err = sock.Recv();
if err != nil {
- Die("鎺ユ敹鍝嶅簲澶辫触: ", 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