style: server 包为服务器启动添加 IP 信息,死锁检测的日志内容优化
This commit is contained in:
parent
ab3926e307
commit
42465a8f42
|
@ -2,6 +2,7 @@ package server
|
|||
|
||||
import (
|
||||
"github.com/kercylan98/minotaur/utils/log"
|
||||
"github.com/kercylan98/minotaur/utils/network"
|
||||
"math"
|
||||
"os"
|
||||
"os/signal"
|
||||
|
@ -61,9 +62,11 @@ func (slf *MultipleServer) Run() {
|
|||
wait.Wait()
|
||||
|
||||
log.Info("Server", log.String(serverMultipleMark, "===================================================================="))
|
||||
ip, _ := network.IP()
|
||||
for _, server := range slf.servers {
|
||||
log.Info("Server", log.String(serverMultipleMark, "RunningInfo"),
|
||||
log.Any("network", server.network),
|
||||
log.String("ip", ip.String()),
|
||||
log.String("listen", server.addr),
|
||||
)
|
||||
}
|
||||
|
|
|
@ -9,6 +9,7 @@ import (
|
|||
"github.com/kercylan98/minotaur/utils/buffer"
|
||||
"github.com/kercylan98/minotaur/utils/concurrent"
|
||||
"github.com/kercylan98/minotaur/utils/log"
|
||||
"github.com/kercylan98/minotaur/utils/network"
|
||||
"github.com/kercylan98/minotaur/utils/str"
|
||||
"github.com/kercylan98/minotaur/utils/super"
|
||||
"github.com/kercylan98/minotaur/utils/timer"
|
||||
|
@ -366,9 +367,11 @@ func (slf *Server) Run(addr string) error {
|
|||
close(messageInitFinish)
|
||||
messageInitFinish = nil
|
||||
if slf.multiple == nil {
|
||||
ip, _ := network.IP()
|
||||
log.Info("Server", log.String(serverMark, "===================================================================="))
|
||||
log.Info("Server", log.String(serverMark, "RunningInfo"),
|
||||
log.Any("network", slf.network),
|
||||
log.String("ip", ip.String()),
|
||||
log.String("listen", slf.addr),
|
||||
)
|
||||
log.Info("Server", log.String(serverMark, "===================================================================="))
|
||||
|
@ -653,7 +656,7 @@ func (slf *Server) dispatchMessage(msg *Message) {
|
|||
select {
|
||||
case <-ctx.Done():
|
||||
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)
|
||||
|
|
Loading…
Reference in New Issue