From b795858cdce32346be4b60a072caa4d3d7b5f8f9 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 31 十月 2019 09:47:48 +0800
Subject: [PATCH] 把关闭socket放在外面
---
labelFilter/req.go | 79 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 24 deletions(-)
diff --git a/labelFilter/req.go b/labelFilter/req.go
index 7fb7bc2..3da1e61 100644
--- a/labelFilter/req.go
+++ b/labelFilter/req.go
@@ -1,6 +1,7 @@
package labelFilter
import (
+ "basic.com/dbapi.git"
"basic.com/valib/logger.git"
"fmt"
"github.com/golang/protobuf/proto"
@@ -13,6 +14,8 @@
"time"
)
+
+var urlPool = make(map[string]chan structure.ResultMsg)
func Die(format string, v ...interface{}) {
logger.Info("+++++++",format)
//os.Exit(1)
@@ -52,49 +55,77 @@
}
}
-func Push(url string,data structure.ResultMsg) {
- var sock mangos.Socket
+func Init(){
+
+ var api dbapi.EventPushApi
+ b, allRules := api.FindAllDetails()
+ logger.Info("鍒濆鍖栦簨浠舵帹閫侊紝鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules)
+ if !b {
+ logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒")
+ }
+ for _, ruleGroup := range allRules {
+ if ruleGroup.Enable { // 澶ц鍒欏紑鍏冲紑鍚姸鎬�
+ for _, url := range ruleGroup.Urls {
+ // 涓烘瘡涓猽rl寤虹珛涓�涓猚han
+ urlPool[url.Url] = make(chan structure.ResultMsg,50)
+ go GoPush(url.Url)
+ }
+ }
+ }
+}
+
+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())
}
errSize := sock.SetOption(mangos.OptionMaxRecvSize,30*1024*1024)
if errSize != nil {
- fmt.Errorf("Failed set MaxRecvSize: %v", err)
+ logger.Error("浼犺緭鐨勬暟鎹秴杩囧ぇ灏忛檺鍒�")
return
}
errTimeOut := sock.SetOption(mangos.OptionRecvDeadline,time.Millisecond * 2000)
if errTimeOut != nil {
- fmt.Errorf("Failed set MaxRecvDeadline: %v", err)
+ logger.Error("鎺ユ敹鍝嶅簲瓒呮椂")
return
}
- //sock.AddTransport(ipc.NewTransport())
sock.AddTransport(tcp.NewTransport())
- if err = sock.Dial(url); err != nil {
- Die("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
+ if err = sock.Dial("tcp://"+url); err != nil {
+ logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: ", err.Error())
}
logger.Info("搴忓垪鍖栨暟鎹�")
- bytes,err1 := proto.Marshal(data)
- logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
- if err1 != nil {
- logger.Info("搴忓垪鍖栧け璐ワ細",err1)
- }
- logger.Debug("鎺ㄩ�佹暟鎹�")
- //bytes := []byte("ndfasojdfaidsos")
- if err = sock.Send(bytes); err != nil {
- Die("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
- }
- msg, err = sock.Recv();
- if err != nil {
- Die("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
- } else {
- logger.Debug("浜嬩欢鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲",string(msg))
+
+ for {
+ select {
+ // case <-ctx.Done():
+ // return
+ case data := <- urlPool[url]:
+
+ 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() {
// url := "tcp://192.168.1.123:40011"
// Push(url,"hahahaha")
--
Gitblit v1.8.0