fixed cluster query which would answer our own requests

broker/cluster/swarm.go

@@ -244,6 +244,11 @@ func (s *Swarm) OnGossip(buf []byte) (delta mesh.GossipData, err error) {
 // OnGossipBroadcast merges received data into state and returns a representation
 // of the received data (typically a delta) for further propagation.
 func (s *Swarm) OnGossipBroadcast(src mesh.PeerName, buf []byte) (delta mesh.GossipData, err error) {
+	if src == s.name {
+		logging.LogAction("merge", "got our own broadcast")
+		return
+	}
+
 	if delta, err = s.merge(buf); err != nil {
 		logging.LogError("merge", "merging", err)
 	}

broker/conn.go

@@ -212,7 +212,7 @@ func (c *Conn) Unsubscribe(ssid message.Ssid, channel []byte) {
 
 // Close terminates the connection.
 func (c *Conn) Close() error {
-	logging.LogTarget("conn", "closed", c.luid)
+	logging.LogTarget("conn", "closed", c.guid)
 
 	// Unsubscribe from everything, no need to lock since each Unsubscribe is
 	// already locked. Locking the 'Close()' would result in a deadlock.

broker/query.go

@@ -114,8 +114,14 @@ func (c *QueryManager) onRequest(ssid message.Ssid, channel string, payload []by
 		return err
 	}
 
+	// Do not answer our own requests
+	replyAddr := mesh.PeerName(reply)
+	if c.service.cluster.ID() == uint64(replyAddr) {
+		return nil
+	}
+
 	// Get the peer to reply to
-	peer := c.service.cluster.FindPeer(mesh.PeerName(reply))
+	peer := c.service.cluster.FindPeer(replyAddr)
 
 	// Go through all the handlers and execute the first matching one
 	for _, handle := range c.handlers {