Joyit 1 сар өмнө
parent
commit
1106e2c28b
2 өөрчлөгдсөн 5 нэмэгдсэн , 4 устгасан
  1. 2 2
      hub.go
  2. 3 2
      line.go

+ 2 - 2
hub.go

@@ -604,7 +604,7 @@ func (h *Hub) BindForServer(info *HostInfo) (err error) {
 		done := false
 		h.lines.Range(func(id int, line *Line) bool {
 			if line.state == Disconnected && line.host == nil && line.IsChannelEqual(channel) {
-				line.Start(conn, nil)
+				line.Start(channel, conn, nil)
 				done = true
 				return false
 			}
@@ -767,7 +767,7 @@ func (h *Hub) ConnectToServer(channel string, force bool, host *HostInfo) (err e
 					return false
 				}
 			}
-			line.Start(conn, host)
+			line.Start(channel, conn, host)
 			done = true
 			return false
 		}

+ 3 - 2
line.go

@@ -304,10 +304,11 @@ func (c *Line) cleanClose() {
 }
 
 // 连接开始运行
-func (c *Line) Start(conn conn.Connect, host *HostInfo) {
+func (c *Line) Start(channel string, conn conn.Connect, host *HostInfo) {
 	now := time.Now()
 	c.updated = now
 	c.lastRead = now // 避免默认为0时被清理
+	c.channel = channel
 	c.conn = conn
 	c.host = host
 	go c.readPump()
@@ -340,6 +341,6 @@ func NewConnect(
 		started:  now,
 		updated:  now,
 	}
-	cc.Start(conn, host)
+	cc.Start(channel, conn, host)
 	return cc
 }