cluster fix

fhmq · Jan 17, 2018 · 7db7eda · 7db7eda
1 parent 1d6f6a4
commit 7db7eda
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/broker/broker.go b/broker/broker.go
@@ -288,17 +288,11 @@ func (b *Broker) handleConnection(typ int, conn net.Conn, idx uint64) {
 		conn:   conn,
 		info:   info,
 	}
+
 	c.init()
 
 	cid := c.info.clientID
 
-	if typ == ROUTER {
-		c.route = route{
-			remoteID:  "",
-			remoteUrl: conn.RemoteAddr().String(),
-		}
-	}
-
 	var msgPool *MessagePool
 	var exist bool
 	var old interface{}
@@ -358,7 +352,7 @@ func (b *Broker) connectRouter(url, remoteID string) {
 		}
 		break
 	}
-	route := &route{
+	route := route{
 		remoteID:  remoteID,
 		remoteUrl: conn.RemoteAddr().String(),
 	}

diff --git a/broker/client.go b/broker/client.go
@@ -32,7 +32,7 @@ type client struct {
 	broker *Broker
 	conn   net.Conn
 	info   info
-	route  *route
+	route  route
 	status int
 	closed chan int
 	smu    sync.RWMutex

diff --git a/broker/info.go b/broker/info.go
@@ -110,13 +110,14 @@ func (c *client) ProcessInfo(packet *packets.PublishPacket) {
 	}
 	b.mu.Unlock()
 
-	// log.Info("isforword: ", isForward)
 	if !isForward {
-		route := &route{
-			remoteUrl: rurl,
-			remoteID:  rid,
+		if c.typ == ROUTER {
+			route := route{
+				remoteUrl: rurl,
+				remoteID:  rid,
+			}
+			c.route = route
 		}
-		c.route = route
 
 		go b.SendLocalSubsToRouter(c)
 		// log.Info("BroadcastInfoMessage starting... ")