blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-10-27 22:12:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'openimsdk:main' into main

Browse Source
This commit is contained in:
chao 2024-07-17 20:11:38 +08:00 committed by GitHub
commit 6df8412f56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/msggateway/client.go
View File

@ -96,12 +96,14 @@ func (c *Client) ResetClient(ctx *UserConnContext, conn LongConn, longConnServer
c.hbCtx, c.hbCancel = context.WithCancel(c.ctx) c.hbCtx, c.hbCancel = context.WithCancel(c.ctx)
} }
func (c *Client) pingHandler(_ string) error { func (c *Client) pingHandler(appData string) error {
if err := c.conn.SetReadDeadline(pongWait); err != nil { if err := c.conn.SetReadDeadline(pongWait); err != nil {
return err return err
} }
return c.writePongMsg() log.ZDebug(c.ctx, "ping Handler Success.", "appData", appData)
return c.writePongMsg(appData)
} }
func (c *Client) pongHandler(_ string) error { func (c *Client) pongHandler(_ string) error {
@ -156,7 +158,7 @@ func (c *Client) readMessage() {
return return
case PingMessage: case PingMessage:
err := c.writePongMsg() err := c.writePongMsg("")
log.ZError(c.ctx, "writePongMsg", err) log.ZError(c.ctx, "writePongMsg", err)
case CloseMessage: case CloseMessage:
@ -378,7 +380,7 @@ func (c *Client) writePingMsg() error {
return c.conn.WriteMessage(PingMessage, nil) return c.conn.WriteMessage(PingMessage, nil)
} }
func (c *Client) writePongMsg() error { func (c *Client) writePongMsg(appData string) error {
if c.closed.Load() { if c.closed.Load() {
return nil return nil
} }
@ -391,5 +393,5 @@ func (c *Client) writePongMsg() error {
return err return err
} }
return c.conn.WriteMessage(PongMessage, nil) return c.conn.WriteMessage(PongMessage, []byte(appData))
} }