don't block on DiscoverHandler

p2p/discovery/mdns.go

@@ -109,37 +109,42 @@ func (m *mdnsService) Close() error {
 }
 
 func (m *mdnsService) pollForEntries() {
+	entriesCh := make(chan *mdns.ServiceEntry, 16)
+	go func() {
+		for entry := range entriesCh {
+			m.handleEntry(entry)
+		}
+	}()
+
 	ticker := time.NewTicker(m.interval)
 	for range ticker.C {
-		entriesCh := make(chan *mdns.ServiceEntry, 16)
-		go func() {
-			for entry := range entriesCh {
-				m.handleEntry(entry)
-			}
-		}()
-
-		qp := mdns.QueryParam{}
-		qp.Domain = "local"
-		qp.Entries = entriesCh
-		qp.Service = ServiceTag
-		qp.Timeout = time.Second * 5
-
-		err := mdns.Query(&qp)
+		log.Debug("starting mdns query")
+		qp := &mdns.QueryParam{
+			Domain:  "local",
+			Entries: entriesCh,
+			Service: ServiceTag,
+			Timeout: time.Second * 5,
+		}
+
+		err := mdns.Query(qp)
 		if err != nil {
 			log.Error("mdns lookup error: ", err)
 		}
 		close(entriesCh)
+		log.Debug("mdns query complete")
 	}
 }
 
 func (m *mdnsService) handleEntry(e *mdns.ServiceEntry) {
+	log.Debugf("Handling MDNS entry: %s:%d %s", e.AddrV4, e.Port, e.Info)
 	mpeer, err := peer.IDB58Decode(e.Info)
 	if err != nil {
 		log.Warning("Error parsing peer ID from mdns entry: ", err)
 		return
 	}
 
 	if mpeer == m.host.ID() {
+		log.Debug("got our own mdns entry, skipping")
 		return
 	}
 
@@ -159,7 +164,7 @@ func (m *mdnsService) handleEntry(e *mdns.ServiceEntry) {
 
 	m.lk.Lock()
 	for _, n := range m.notifees {
-		n.HandlePeerFound(pi)
+		go n.HandlePeerFound(pi)
 	}
 	m.lk.Unlock()
 }