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 | 84 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index af65097..ccba8de 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -4,18 +4,24 @@
"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 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)
@@ -67,11 +73,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)
- go GoPush(url.Url)
- return
- }
+ ch := make(chan *structure.ResultMsg,10)
+ var urlCh = urlChan{url.Url,ch}
+ urlChans = append(urlChans,urlCh)
+ go GoPush(url.Url)
}
}
}
@@ -79,7 +84,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())
@@ -110,37 +115,42 @@
}
logger.Info("搴忓垪鍖栨暟鎹�")
- for v := range urlPool[url]{
- logger.Info(v)
- }
-
- //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:
- //
- // }
+ //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 := <- ch:
+ 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:
+
+ }
+ }
sock.Close()
}
//func main() {
--
Gitblit v1.8.0