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 | 66 +++++++++++++++++----------------
labelFilter/ruleForLabel.go | 4 +-
2 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index d4ae074..77b7e7c 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -4,6 +4,7 @@
"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"
@@ -16,6 +17,7 @@
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)
@@ -68,7 +70,7 @@
for _, url := range ruleGroup.Urls {
// 涓烘瘡涓猽rl寤虹珛涓�涓猚han
if strings.Contains(url.Url,"114") {
- urlPool[url.Url] = make(chan structure.ResultMsg,10)
+ //urlPool[url.Url] = make(chan structure.ResultMsg,10)
go GoPush(url.Url)
}
}
@@ -78,7 +80,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())
@@ -109,37 +111,37 @@
}
logger.Info("搴忓垪鍖栨暟鎹�")
- for v := range urlPool[url]{
- logger.Info("鏃犻檺寰幆",v.Cid)
- }
-
- //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)
//}
+
+ for {
+ select {
+ // case <-ctx.Done():
+ // return
+ case data := <- pool:
+ 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() {
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 4da3157..3cce737 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -320,8 +320,8 @@
func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
for _, url := range urls {
logger.Debug("鐪嬬湅鎺ㄩ�佸湴鍧�锛�",url.Url)
- urlPool[url.Url] <- data
- logger.Info("urlPool澶у皬锛� ", len(urlPool[url.Url]))
+ pool <- &data
+ //logger.Info("urlPool澶у皬锛� ", len(urlPool[url.Url]))
}
}
--
Gitblit v1.8.0