chenyh
/
vRp.CD2g_test
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

other: 优化 server 包部分 error 的处理方式

This commit is contained in:
kercylan98 2023-12-20 09:48:03 +08:00
parent 34a680e710
commit 82ecb98397
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/server.go
View File

@ -693,7 +693,7 @@ func (slf *Server) dispatchMessage(dispatcher *dispatcher, msg *Message) {
go func(ctx context.Context, msg *Message) { go func(ctx context.Context, msg *Message) {
select { select {
case <-ctx.Done(): case <-ctx.Done():
if err := ctx.Err(); err == context.DeadlineExceeded { if err := ctx.Err(); errors.Is(err, context.DeadlineExceeded) {
log.Warn("Server", log.String("MessageType", messageNames[msg.t]), log.String("Info", msg.String()), log.Any("SuspectedDeadlock", msg)) log.Warn("Server", log.String("MessageType", messageNames[msg.t]), log.String("Info", msg.String()), log.Any("SuspectedDeadlock", msg))
slf.OnDeadlockDetectEvent(msg) slf.OnDeadlockDetectEvent(msg)
} }
@ -708,9 +708,7 @@ func (slf *Server) dispatchMessage(dispatcher *dispatcher, msg *Message) {
stack := string(debug.Stack()) stack := string(debug.Stack())
log.Error("Server", log.String("MessageType", messageNames[msg.t]), log.String("Info", msg.String()), log.Any("error", err), log.String("stack", stack)) log.Error("Server", log.String("MessageType", messageNames[msg.t]), log.String("Info", msg.String()), log.Any("error", err), log.String("stack", stack))
fmt.Println(stack) fmt.Println(stack)
if e, ok := err.(error); ok { slf.OnMessageErrorEvent(msg, fmt.Errorf("%v", err))
slf.OnMessageErrorEvent(msg, e)
}
} }
if msg.t == MessageTypeUniqueAsyncCallback || msg.t == MessageTypeUniqueShuntAsyncCallback { if msg.t == MessageTypeUniqueAsyncCallback || msg.t == MessageTypeUniqueShuntAsyncCallback {
dispatcher.antiUnique(msg.name) dispatcher.antiUnique(msg.name)
@ -729,7 +727,9 @@ func (slf *Server) dispatchMessage(dispatcher *dispatcher, msg *Message) {
switch msg.t { switch msg.t {
case MessageTypePacket: case MessageTypePacket:
if !slf.OnConnectionPacketPreprocessEvent(msg.conn, msg.packet, func(newPacket []byte) { msg.packet = newPacket }) { if !slf.OnConnectionPacketPreprocessEvent(msg.conn, msg.packet, func(newPacket []byte) {
msg.packet = newPacket
}) {
slf.OnConnectionReceivePacketEvent(msg.conn, msg.packet) slf.OnConnectionReceivePacketEvent(msg.conn, msg.packet)
} }
case MessageTypeError: case MessageTypeError: