mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-04-24 18:36:19 +08:00
ws update
This commit is contained in:
parent
4c18e47e96
commit
3239dfe0a0
@ -18,6 +18,7 @@ import (
|
|||||||
var ErrConnClosed = errors.New("conn has closed")
|
var ErrConnClosed = errors.New("conn has closed")
|
||||||
var ErrNotSupportMessageProtocol = errors.New("not support message protocol")
|
var ErrNotSupportMessageProtocol = errors.New("not support message protocol")
|
||||||
var ErrClientClosed = errors.New("client actively close the connection")
|
var ErrClientClosed = errors.New("client actively close the connection")
|
||||||
|
var ErrPanic = errors.New("panic error")
|
||||||
|
|
||||||
const (
|
const (
|
||||||
// MessageText is for UTF-8 encoded text messages like JSON.
|
// MessageText is for UTF-8 encoded text messages like JSON.
|
||||||
@ -82,6 +83,7 @@ func (c *Client) pongHandler(_ string) error {
|
|||||||
func (c *Client) readMessage() {
|
func (c *Client) readMessage() {
|
||||||
defer func() {
|
defer func() {
|
||||||
if r := recover(); r != nil {
|
if r := recover(); r != nil {
|
||||||
|
c.closedErr = ErrPanic
|
||||||
fmt.Println("socket have panic err:", r, string(debug.Stack()))
|
fmt.Println("socket have panic err:", r, string(debug.Stack()))
|
||||||
}
|
}
|
||||||
c.close()
|
c.close()
|
||||||
@ -95,7 +97,7 @@ func (c *Client) readMessage() {
|
|||||||
c.closedErr = returnErr
|
c.closedErr = returnErr
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
log.ZDebug(c.ctx, "readMessage", "messageType", messageType, "message", string(message))
|
log.ZDebug(c.ctx, "readMessage", "messageType", messageType)
|
||||||
if c.closed == true { //连接刚置位已经关闭,但是协程还没退出的场景
|
if c.closed == true { //连接刚置位已经关闭,但是协程还没退出的场景
|
||||||
c.closedErr = ErrConnClosed
|
c.closedErr = ErrConnClosed
|
||||||
return
|
return
|
||||||
|
Loading…
x
Reference in New Issue
Block a user