From e41df22644371efc13c845e9c21fdf00b8dd5886 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 02 十一月 2019 16:49:01 +0800
Subject: [PATCH] ---
---
labelFilter/req.go | 52 +++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index 134b642..2efa1f1 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -4,23 +4,22 @@
"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)
//os.Exit(1)
@@ -74,10 +73,9 @@
// 涓烘瘡涓猽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)
+ ch := make(chan []byte,10)
+ urlPool[url.Url] = ch
+ logger.Info("鍒濆鍖栦俊鎭細",ch,urlPool)
go GoPush(url.Url)
}
}
@@ -121,27 +119,27 @@
//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淇℃伅锛�",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)
- }
+ case data := <- urlPool[url]:
+ //logger.Info("鎺ユ敹鍒版暟鎹�",data.Cid)
+ //bytes,err1 := proto.Marshal(data)
+ logger.Info("鏁版嵁闀垮害涓猴細",len(data))
+ //if err1 != nil {
+ // logger.Info("搴忓垪鍖栧け璐ワ細",err1)
+ //}
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())
}
msg, err = sock.Recv();
--
Gitblit v1.8.0