liuxiaolong
2019-05-30 1be96db055f47f93c8d0e6409e764353e54942ec
rm logs
2个文件已修改
16 ■■■■ 已修改文件
client.go 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server.go 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
client.go
@@ -102,14 +102,12 @@
func (d *DiscoveryClient) run() {
    var err error
    var surveyMsg []byte
    for {
        surveyMsg, err = d.sock.Recv()
        _, err = d.sock.Recv()
        if err != nil {
            log.Println("DiscoveryClient: Cannot receive the SURVEY", err.Error())
        } else {
            log.Printf("client:%s received surveyor msg=%s ",d.service,string(surveyMsg))
            select {
            case <-d.ctx.Done():
                return
@@ -118,8 +116,6 @@
                err = d.sock.Send([]byte(d.service))
                if err != nil {
                    log.Println("DiscoveryClient: Cannot send the SURVEY response", err.Error())
                }else {
                    log.Printf("client:%s sent response i'm online",d.service)
                }
            }
        }
server.go
@@ -141,7 +141,7 @@
    var msg []byte
    var responses StringSet
    err = d.sock.Send([]byte("are you ok?"))
    err = d.sock.Send([]byte(""))
    if err != nil {
        log.Println("DiscoveryServer: Error sending the SURVEY", err.Error())
        return
@@ -151,21 +151,17 @@
    for {
        msg, err = d.sock.Recv()
        if err != nil {
            if err == mangos.ErrRecvTimeout {//在超时时间内收到的响应
            if err == mangos.ErrRecvTimeout {
                // Timeout means I can add the current responses to the SET
                fmt.Println("mangos.ErrRecvTimeout")
                d.services.Add(responses)
                return
            }
            //fmt.Println(" err: ",err.Error())
            //log.Println("DiscoveryServer: Error reading SURVEY responses", err.Error())
        } else {
            fmt.Printf("poll received msg:%s \n",string(msg))
            responses.Add(string(msg))
            //break
        }
    }
    fmt.Println("for out")
}
func NewPublisher(ctx context.Context, url string) (*Publisher, error) {
@@ -235,7 +231,7 @@
    s.nodes = responses
    // publish the changes
    s.publisher.Publish(s.nodes.ToSlice())
    //s.publisher.Publish(s.nodes.ToSlice())//publish nodes changed
}
func (d *DiscoveryServer) PublishMsg(msg string){