From 42465a8f42cb3a3515263318ac41403473476cb4 Mon Sep 17 00:00:00 2001 From: kercylan98 Date: Tue, 19 Sep 2023 12:35:26 +0800 Subject: [PATCH] =?UTF-8?q?style:=20server=20=E5=8C=85=E4=B8=BA=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E5=90=AF=E5=8A=A8=E6=B7=BB=E5=8A=A0=20IP=20?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=AD=BB=E9=94=81=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E5=86=85=E5=AE=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/multiple.go | 3 +++ server/server.go | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/server/multiple.go b/server/multiple.go index 9f15def..7848108 100644 --- a/server/multiple.go +++ b/server/multiple.go @@ -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), ) } diff --git a/server/server.go b/server/server.go index 36d8d72..d9e0362 100644 --- a/server/server.go +++ b/server/server.go @@ -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)