From b4add78c5c4f581f8c005c8b4ccf090e03424be1 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 01 十一月 2019 18:02:42 +0800
Subject: [PATCH] ---
---
labelFilter/req.go | 56 ++++++++++++++++++++++++++++++--------------------------
main.go | 2 +-
labelFilter/ruleForLabel.go | 2 +-
3 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index 5403bd3..af65097 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -110,33 +110,37 @@
}
logger.Info("搴忓垪鍖栨暟鎹�")
- 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 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:
+ //
+ // }
+ //}
sock.Close()
}
//func main() {
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 4da3157..30e2d86 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -320,7 +320,7 @@
func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
for _, url := range urls {
logger.Debug("鐪嬬湅鎺ㄩ�佸湴鍧�锛�",url.Url)
- urlPool[url.Url] <- data
+ //urlPool[url.Url] <- data
logger.Info("urlPool澶у皬锛� ", len(urlPool[url.Url]))
}
}
diff --git a/main.go b/main.go
index 1969eb4..7f9a5d6 100644
--- a/main.go
+++ b/main.go
@@ -108,7 +108,7 @@
insertdata.InsertToEs(resultMsg)
logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", time.Since(start))
//浜嬩欢鎺ㄩ��
- labelFilter.PushSomthing(resultMsg)
+ go labelFilter.PushSomthing(resultMsg)
//}(msg)
}
}
--
Gitblit v1.8.0