From ba24b09c71afba891b888bc51308ba9e4503c325 Mon Sep 17 00:00:00 2001 From: kercylan98 Date: Tue, 19 Dec 2023 16:00:45 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E7=A7=BB=E9=99=A4=20server=20?= =?UTF-8?q?=E6=85=A2=E6=B6=88=E6=81=AF=E6=97=A0=E6=84=8F=E4=B9=89=E7=9A=84?= =?UTF-8?q?=E5=A0=86=E6=A0=88=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=20String=20=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E4=B8=8D=E5=86=8D=E6=98=AF=E7=AE=80?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/message.go | 13 ++++++++++++- server/server.go | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/server/message.go b/server/message.go index 500ace4..d339566 100644 --- a/server/message.go +++ b/server/message.go @@ -3,6 +3,7 @@ package server import ( "github.com/kercylan98/minotaur/utils/hash" "github.com/kercylan98/minotaur/utils/log" + "github.com/kercylan98/minotaur/utils/super" ) const ( @@ -128,7 +129,17 @@ func (slf *Message) MessageType() MessageType { // String 返回消息的字符串表示 func (slf *Message) String() string { - return slf.t.String() + var info = struct { + Type string `json:"type,omitempty"` + Name string `json:"name,omitempty"` + Packet string `json:"packet,omitempty"` + }{ + Type: slf.t.String(), + Name: slf.name, + Packet: string(slf.packet), + } + + return string(super.MarshalJSON(info)) } // String 返回消息类型的字符串表示 diff --git a/server/server.go b/server/server.go index fe346fc..5134858 100644 --- a/server/server.go +++ b/server/server.go @@ -676,8 +676,8 @@ func (slf *Server) low(message *Message, present time.Time, expect time.Duration var fields = make([]log.Field, 0, len(message.marks)+4) fields = append(fields, log.String("type", messageNames[message.t]), log.String("cost", cost.String()), log.String("message", message.String())) fields = append(fields, message.marks...) - fields = append(fields, log.Stack("stack")) - log.Warn("Server", fields...) + //fields = append(fields, log.Stack("stack")) + log.Warn("ServerLowMessage", fields...) slf.OnMessageLowExecEvent(message, cost) } }