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

fix: 修复 gnet 作为服务器核心关闭时导致的空指针问题

This commit is contained in:
kercylan98 2023-09-13 16:45:31 +08:00
parent dc3c7d2eea
commit 2712f3b98e
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

@ -470,6 +470,11 @@ func (slf *Server) shutdown(err error) {
slf.multipleRuntimeErrorChan <- err slf.multipleRuntimeErrorChan <- err
} }
}() }()
if slf.gServer != nil && slf.isRunning {
if shutdownErr := gnet.Stop(context.Background(), fmt.Sprintf("%s://%s", slf.network, slf.addr)); err != nil {
log.Error("Server", log.Err(shutdownErr))
}
}
if slf.ticker != nil { if slf.ticker != nil {
slf.ticker.Release() slf.ticker.Release()
} }
@ -503,11 +508,6 @@ func (slf *Server) shutdown(err error) {
log.Error("Server", log.Err(shutdownErr)) log.Error("Server", log.Err(shutdownErr))
} }
} }
if slf.gServer != nil && slf.isRunning {
if shutdownErr := gnet.Stop(context.Background(), fmt.Sprintf("%s://%s", slf.network, slf.addr)); err != nil {
log.Error("Server", log.Err(shutdownErr))
}
}
if err != nil { if err != nil {
if slf.multiple != nil { if slf.multiple != nil {