update heartbeat logic.

pull/2404/head
Monet Lee 1 year ago
parent afd3421773
commit a91a8b9c8b

@ -90,7 +90,7 @@ func (c *Client) ResetClient(ctx *UserConnContext, conn LongConn, longConnServer
c.closed.Store(false) c.closed.Store(false)
c.closedErr = nil c.closedErr = nil
c.token = ctx.GetToken() c.token = ctx.GetToken()
c.hbCtx, _ = context.WithTimeout(c.ctx, pongWait*2) c.hbCtx, _ = context.WithCancel(c.ctx)
} }
func (c *Client) pingHandler(_ string) error { func (c *Client) pingHandler(_ string) error {
@ -114,10 +114,7 @@ func (c *Client) readMessage() {
c.conn.SetReadLimit(maxMessageSize) c.conn.SetReadLimit(maxMessageSize)
_ = c.conn.SetReadDeadline(pongWait) _ = c.conn.SetReadDeadline(pongWait)
c.conn.SetPingHandler(c.pingHandler) c.conn.SetPingHandler(c.pingHandler)
go c.heartbeat(c.hbCtx)
if c.PlatformID == constant.WebPlatformID {
go c.heartbeat(c.hbCtx)
}
for { for {
log.ZDebug(c.ctx, "readMessage") log.ZDebug(c.ctx, "readMessage")
@ -331,19 +328,21 @@ func (c *Client) writeBinaryMsg(resp Resp) error {
} }
func (c *Client) heartbeat(ctx context.Context) { func (c *Client) heartbeat(ctx context.Context) {
log.ZDebug(ctx, "server initiative send heartbeat start.") if c.PlatformID == constant.WebPlatformID {
ticker := time.NewTicker(pingPeriod) log.ZDebug(ctx, "server initiative send heartbeat start.")
defer ticker.Stop() ticker := time.NewTicker(pingPeriod)
defer ticker.Stop()
for {
select { for {
case <-ticker.C: select {
if err := c.conn.WriteMessage(PingMessage, nil); err != nil { case <-ticker.C:
log.ZError(c.ctx, "send Ping Message error.", err) if err := c.conn.WriteMessage(PingMessage, nil); err != nil {
log.ZError(c.ctx, "send Ping Message error.", err)
return
}
case <-c.hbCtx.Done():
return return
} }
case <-c.hbCtx.Done():
return
} }
} }
} }

Loading…
Cancel
Save