---
panlei
2019-11-02 e41df22644371efc13c845e9c21fdf00b8dd5886
---
2个文件已修改
65 ■■■■ 已修改文件
labelFilter/req.go 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
labelFilter/ruleForLabel.go 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 @@
                // 为每个url建立一个chan
                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+"推送socket发送数据失败: ", err.Error())
            }
            msg, err = sock.Recv();
labelFilter/ruleForLabel.go
@@ -4,6 +4,7 @@
    "basic.com/dbapi.git"
    "basic.com/pubsub/protomsg.git"
    "basic.com/valib/logger.git"
    "github.com/golang/protobuf/proto"
    "github.com/knetic/govaluate"
    "ruleprocess/structure"
    "strconv"
@@ -320,14 +321,12 @@
func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
    for _, url := range urls {
        logger.Debug("看看推送地址:",url.Url)
        for _, v := range urlChans  {
            if v.url == url.Url{
                v.ch <- &data
                logger.Info("chan信息:",v.ch)
            }
        bytes,err1 := proto.Marshal(data)
        if err1 != nil {
            logger.Info("序列化失败:",err1)
        }
        //logger.Info("urlPool大小: ", len(urlPool[url.Url]))
        urlPool[url.Url] <- bytes
        logger.Info("urlPool大小: ", urlPool[url.Url])
    }
}