fix test

liuxiaolong

2020-01-14 f51eaaedb99d04d20500e3c7166b122940f2508d

 mangos.go

@@ -8,10 +8,10 @@
)

type mangosPubSub struct {
   url string
   url          string
   heartBeatUrl string
   pubCh chan Message  //publish msg chan
   aliveNodes gopherdiscovery.StringSet
   pubCh        chan Message  //publish msg chan
   surveyors    gopherdiscovery.StringSet

   recvCh chan Message  //recv msg chan
}
@@ -30,16 +30,15 @@

   discoveryServer, err = gopherdiscovery.Server(heartBeatUrl, publishUrl, defaultOpts)

   fmt.Println("err:",err)
   fmt.Println("newPub err:",err)
   pub := &mangosPubSub{
      url: publishUrl,
      url:          publishUrl,
      heartBeatUrl: heartBeatUrl,
      aliveNodes: gopherdiscovery.NewStringSet(),
      pubCh: make(chan Message, 50),
      surveyors:    gopherdiscovery.NewStringSet(),
      pubCh:        make(chan Message, 50),
   }
   var msgCache = make(map[string]Message)
   //clientMsgCh := make(map[string]chan Message)
   cacheNodes := gopherdiscovery.NewStringSet()
   go func() {
      for {
         select {
@@ -50,7 +49,7 @@
            //      ch <- msg
            //   }
            //}
            if cacheNodes.Cardinality() >0 {
            if pub.surveyors.Cardinality() >0 {
               sendB, _ := json.Marshal(msg)
               discoveryServer.PublishMsg(string(sendB))
            }
@@ -62,19 +61,23 @@
            //      clientMsgCh[nodeId] = make(chan Message)
            //   }
            //}

            if len(cacheNodes.Difference(nodeIds).ToSlice()) > 0 { //节点有变化的时候，也需要发消息
               fmt.Println("aliveNodes:",nodeIds)
               if len(msgCache) > 0 {
                  for _,cMsg := range msgCache {
                     sendB, _ := json.Marshal(cMsg)
                     discoveryServer.PublishMsg(string(sendB))
            removedNodes := pub.surveyors.Difference(nodeIds)
            addedNodes := nodeIds.Difference(pub.surveyors)
            if len(nodeIds.ToSlice()) >0 {
               if addedNodes.Cardinality() >0 { //有新节点上线的时候，需要发一次消息，节点离线的时候不用管
                  fmt.Println("removedNodes:", removedNodes, "addedNodes:", addedNodes)
                  if len(msgCache) > 0 {
                     for _,cMsg := range msgCache {
                        sendB, _ := json.Marshal(cMsg)
                        discoveryServer.PublishMsg(string(sendB))
                     }
                  }
               }
            } else {
               pub.surveyors = nodeIds
            } else {//订阅者全部阵亡
               pub.surveyors = nodeIds
               time.Sleep(10 * time.Millisecond)
            }
            cacheNodes = discoveryServer.AliveNodes()
         }
      }
   }()
@@ -94,6 +97,7 @@
      url:subcribeUrl,
      heartBeatUrl: heartBeatUrl,
      recvCh: make(chan Message,50),
      surveyors: gopherdiscovery.NewStringSet(),
   }
   go func() {
      peers, _ := client.Peers()
@@ -123,6 +127,10 @@
   return false
}

func (ps *mangosPubSub) Surveyor() []string {
   return ps.surveyors.ToSlice()
}

func (ps *mangosPubSub) Publish(msg Message) {
   ps.pubCh <- msg
}