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

style: server 包为服务器启动添加 IP 信息，死锁检测的日志内容优化

This commit is contained in:
kercylan98 2023-09-19 12:35:26 +08:00
parent ab3926e307
commit 42465a8f42
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/multiple.go
View File

@ -2,6 +2,7 @@ package server
import ( import (
"github.com/kercylan98/minotaur/utils/log" "github.com/kercylan98/minotaur/utils/log"
"github.com/kercylan98/minotaur/utils/network"
"math" "math"
"os" "os"
"os/signal" "os/signal"
@ -61,9 +62,11 @@ func (slf *MultipleServer) Run() {
wait.Wait() wait.Wait()
log.Info("Server", log.String(serverMultipleMark, "====================================================================")) log.Info("Server", log.String(serverMultipleMark, "===================================================================="))
ip, _ := network.IP()
for _, server := range slf.servers { for _, server := range slf.servers {
log.Info("Server", log.String(serverMultipleMark, "RunningInfo"), log.Info("Server", log.String(serverMultipleMark, "RunningInfo"),
log.Any("network", server.network), log.Any("network", server.network),
log.String("ip", ip.String()),
log.String("listen", server.addr), log.String("listen", server.addr),
) )
} }

5
server/server.go
View File

@ -9,6 +9,7 @@ import (
"github.com/kercylan98/minotaur/utils/buffer" "github.com/kercylan98/minotaur/utils/buffer"
"github.com/kercylan98/minotaur/utils/concurrent" "github.com/kercylan98/minotaur/utils/concurrent"
"github.com/kercylan98/minotaur/utils/log" "github.com/kercylan98/minotaur/utils/log"
"github.com/kercylan98/minotaur/utils/network"
"github.com/kercylan98/minotaur/utils/str" "github.com/kercylan98/minotaur/utils/str"
"github.com/kercylan98/minotaur/utils/super" "github.com/kercylan98/minotaur/utils/super"
"github.com/kercylan98/minotaur/utils/timer" "github.com/kercylan98/minotaur/utils/timer"
@ -366,9 +367,11 @@ func (slf *Server) Run(addr string) error {
close(messageInitFinish) close(messageInitFinish)
messageInitFinish = nil messageInitFinish = nil
if slf.multiple == nil { if slf.multiple == nil {
ip, _ := network.IP()
log.Info("Server", log.String(serverMark, "====================================================================")) log.Info("Server", log.String(serverMark, "===================================================================="))
log.Info("Server", log.String(serverMark, "RunningInfo"), log.Info("Server", log.String(serverMark, "RunningInfo"),
log.Any("network", slf.network), log.Any("network", slf.network),
log.String("ip", ip.String()),
log.String("listen", slf.addr), log.String("listen", slf.addr),
) )
log.Info("Server", log.String(serverMark, "====================================================================")) log.Info("Server", log.String(serverMark, "===================================================================="))
@ -653,7 +656,7 @@ func (slf *Server) dispatchMessage(msg *Message) {
select { select {
case <-ctx.Done(): case <-ctx.Done():
if err := ctx.Err(); err == context.DeadlineExceeded { if err := ctx.Err(); err == context.DeadlineExceeded {
log.Warn("Server", log.String("MessageType", messageNames[msg.t]), log.Any("SuspectedDeadlock", msg.attrs)) log.Warn("Server", log.String("MessageType", messageNames[msg.t]), log.Any("SuspectedDeadlock", msg))
} }
} }
}(ctx, msg) }(ctx, msg)