From 93d71c9a7e4c583ba1598aae131fb3aea71f296c Mon Sep 17 00:00:00 2001 From: kercylan98 Date: Thu, 27 Apr 2023 14:06:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game/builtin/examples/game/game/app.go | 2 +- server/event.go | 2 ++ server/server.go | 6 ++++++ utils/log/log.go | 8 ++++++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/game/builtin/examples/game/game/app.go b/game/builtin/examples/game/game/app.go index 7be3dd6..66e9003 100644 --- a/game/builtin/examples/game/game/app.go +++ b/game/builtin/examples/game/game/app.go @@ -12,7 +12,7 @@ var ( ) func init() { - Server = server.New(server.NetworkTCP) + Server = server.New(server.NetworkWebsocket) Game = &app{ World: builtin.NewWorld[int64, *Player](0), } diff --git a/server/event.go b/server/event.go index dd47c2f..81d2791 100644 --- a/server/event.go +++ b/server/event.go @@ -56,6 +56,7 @@ func (slf *event) RegConnectionClosedEvent(handle ConnectionClosedEventHandle) { } func (slf *event) OnConnectionClosedEvent(conn *Conn) { + log.Debug("Server", zap.String("ConnectionClosed", conn.GetID())) slf.Server.connections.Delete(conn.ip) for _, handle := range slf.connectionClosedEventHandles { handle(conn) @@ -72,6 +73,7 @@ func (slf *event) RegConnectionOpenedEvent(handle ConnectionOpenedEventHandle) { } func (slf *event) OnConnectionOpenedEvent(conn *Conn) { + log.Debug("Server", zap.String("ConnectionOpened", conn.GetID())) slf.Server.connections.Set(conn.ip, conn) for _, handle := range slf.connectionOpenedEventHandles { handle(conn) diff --git a/server/server.go b/server/server.go index 10f9d8e..629494a 100644 --- a/server/server.go +++ b/server/server.go @@ -141,6 +141,7 @@ func (slf *Server) Run(addr string) error { }) case NetworkHttp: if slf.prod { + log.SetProd() gin.SetMode(gin.ReleaseMode) } go func() { @@ -237,6 +238,11 @@ func (slf *Server) IsProd() bool { return slf.prod } +// IsDev 是否为开发模式 +func (slf *Server) IsDev() bool { + return !slf.prod +} + // Shutdown 停止运行服务器 func (slf *Server) Shutdown(err error) { if slf.connections != nil { diff --git a/utils/log/log.go b/utils/log/log.go index 9ae23f8..911ec29 100644 --- a/utils/log/log.go +++ b/utils/log/log.go @@ -12,10 +12,10 @@ import ( var ( Logger *zap.Logger + prod bool ) const ( - debug = true logPath = "./logs" logTime = 7 ) @@ -52,7 +52,7 @@ func newLogger() *zap.Logger { var cores zapcore.Core - if debug { + if !prod { cores = zapcore.NewTee( zapcore.NewCore(encoder, zapcore.AddSync(os.Stdout), debugLevel), ) @@ -100,3 +100,7 @@ func Debug(msg string, fields ...zap.Field) { func Error(msg string, fields ...zap.Field) { Logger.Error(msg, fields...) } + +func SetProd() { + prod = true +}