panlei
2019-11-01 f11969d42d9b3ec2413950a95004299dcf334884
用结构体标记chan
2个文件已修改
31 ■■■■ 已修改文件
labelFilter/req.go 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
labelFilter/ruleForLabel.go 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
labelFilter/req.go
@@ -11,12 +11,16 @@
    "nanomsg.org/go-mangos/transport/ipc"
    "nanomsg.org/go-mangos/transport/tcp"
    "ruleprocess/structure"
    "strings"
    "time"
)
var urlPool = make(map[string]chan structure.ResultMsg)
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)
@@ -69,10 +73,10 @@
        if ruleGroup.Enable { // 大规则开关开启状态
            for _, url := range ruleGroup.Urls {
                // 为每个url建立一个chan
                if strings.Contains(url.Url,"114") {
                    //urlPool[url.Url] = make(chan structure.ResultMsg,10)
                    go GoPush(url.Url)
                }
                ch := make(chan *structure.ResultMsg,10)
                var urlCh = urlChan{url.Url,ch}
                urlChans = append(urlChans,urlCh)
                go GoPush(url.Url)
            }
        }
    }
@@ -114,12 +118,17 @@
    //for v := range pool{
    //    logger.Info("无限循环",v.Cid)
    //}
    var ch chan *structure.ResultMsg
    for _, v := range urlChans  {
        if v.url == url{
            ch = v.ch
        }
    }
    for {
        select {
        // case <-ctx.Done():
        //     return
        case data := <- pool:
        case data := <- ch:
            logger.Info("接收到数据",data.Cid)
            bytes,err1 := proto.Marshal(data)
            logger.Info("数据长度为:",len(bytes))
labelFilter/ruleForLabel.go
@@ -320,7 +320,13 @@
func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
    for _, url := range urls {
        logger.Debug("看看推送地址:",url.Url)
        pool <- &data
        var ch chan *structure.ResultMsg
        for _, v := range urlChans  {
            if v.url == url.Url{
                ch = v.ch
            }
        }
        ch <- &data
        //logger.Info("urlPool大小: ", len(urlPool[url.Url]))
    }
}