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

recessive: 日志优化

This commit is contained in:
kercylan98 2023-07-07 16:39:09 +08:00
parent 7228a07e7e
commit e0a0aaa605
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/event.go
View File

@ -73,7 +73,7 @@ func (slf *event) OnConsoleCommandEvent(command string) {
if !exist { if !exist {
switch command { switch command {
case "exit", "quit", "close", "shutdown", "EXIT", "QUIT", "CLOSE", "SHUTDOWN": case "exit", "quit", "close", "shutdown", "EXIT", "QUIT", "CLOSE", "SHUTDOWN":
log.Info("Console", zap.String("Receive", command), zap.String("Action", "shutdown")) log.Info("Console", zap.String("Receive", command), zap.String("Action", "Shutdown"))
slf.Server.shutdown(nil) slf.Server.shutdown(nil)
return return
} }

2
server/gnet.go
View File

@ -23,7 +23,7 @@ func (slf *gNet) OnShutdown(server gnet.Server) {
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
defer cancel() defer cancel()
if err := gnet.Stop(ctx, fmt.Sprintf("%s://%s", slf.network, slf.addr)); err != nil { if err := gnet.Stop(ctx, fmt.Sprintf("%s://%s", slf.network, slf.addr)); err != nil {
log.Error("Server", zap.String("Minotaur GNet Server", "shutdown"), zap.Error(err)) log.Error("Server", zap.String("Minotaur GNet Server", "Shutdown"), zap.Error(err))
} }
} }

2
server/message.go
View File

@ -36,7 +36,7 @@ const (
var messageErrorActionNames = map[MessageErrorAction]string{ var messageErrorActionNames = map[MessageErrorAction]string{
MessageErrorActionNone: "None", MessageErrorActionNone: "None",
MessageErrorActionShutdown: "shutdown", MessageErrorActionShutdown: "Shutdown",
} }
type ( type (

6
server/server.go
View File

@ -415,7 +415,7 @@ func (slf *Server) shutdown(err error, stack ...string) {
if slf.multiple != nil { if slf.multiple != nil {
slf.multiple.RegExitEvent(func() { slf.multiple.RegExitEvent(func() {
log.ErrorWithStack("Server", s, zap.Any("network", slf.network), zap.String("listen", slf.addr), log.ErrorWithStack("Server", s, zap.Any("network", slf.network), zap.String("listen", slf.addr),
zap.String("action", "shutdown"), zap.String("state", "exception"), zap.Error(err)) zap.String("action", "Shutdown"), zap.String("state", "exception"), zap.Error(err))
}) })
for i, server := range slf.multiple.servers { for i, server := range slf.multiple.servers {
if server.addr == slf.addr { if server.addr == slf.addr {
@ -425,11 +425,11 @@ func (slf *Server) shutdown(err error, stack ...string) {
} }
} else { } else {
log.ErrorWithStack("Server", s, zap.Any("network", slf.network), zap.String("listen", slf.addr), log.ErrorWithStack("Server", s, zap.Any("network", slf.network), zap.String("listen", slf.addr),
zap.String("action", "shutdown"), zap.String("state", "exception"), zap.Error(err)) zap.String("action", "Shutdown"), zap.String("state", "exception"), zap.Error(err))
} }
} else { } else {
log.Info("Server", zap.Any("network", slf.network), zap.String("listen", slf.addr), log.Info("Server", zap.Any("network", slf.network), zap.String("listen", slf.addr),
zap.String("action", "shutdown"), zap.String("state", "normal")) zap.String("action", "Shutdown"), zap.String("state", "normal"))
} }
if slf.gServer == nil { if slf.gServer == nil {
slf.closeChannel <- struct{}{} slf.closeChannel <- struct{}{}