diff --git a/log/log.go b/log/log.go index 4a2b364..62cb826 100644 --- a/log/log.go +++ b/log/log.go @@ -32,7 +32,7 @@ func init() { consoleEncoder := zapcore.NewConsoleEncoder(zap.NewDevelopmentEncoderConfig()) - logger := zap.New(zapcore.NewCore(consoleEncoder, w, atom), zap.AddCallerSkip(1)) + logger := zap.New(zapcore.NewCore(consoleEncoder, w, atom), zap.AddCallerSkip(1),zap.AddCaller()) sugar = logger.Sugar() diff --git a/server/common.go b/server/common.go index e89a85e..89cce05 100644 --- a/server/common.go +++ b/server/common.go @@ -19,7 +19,7 @@ func HttpHandler(f func(*gin.Context) (interface{}, error)) gin.HandlerFunc { }) return } - log.Debug("url %v return: %+v", ctx.Request.URL, r) + log.Debugf("url %v return: %+v", ctx.Request.URL, r) ctx.JSON(200, Response{ Code: 0, diff --git a/server/server.go b/server/server.go index 607bcb6..672b712 100644 --- a/server/server.go +++ b/server/server.go @@ -10,7 +10,6 @@ import ( "polaris/pkg/tmdb" "polaris/pkg/transmission" "polaris/ui" - "time" ginzap "github.com/gin-contrib/zap" @@ -48,7 +47,7 @@ func (s *Server) Serve() error { s.jwtSerect = s.db.GetSetting(db.JwtSerectKey) //st, _ := fs.Sub(ui.Web, "build/web") s.r.Use(static.Serve("/", static.EmbedFolder(ui.Web, "build/web"))) - s.r.Use(ginzap.Ginzap(log.Logger().Desugar(), time.RFC3339, false)) + //s.r.Use(ginzap.Ginzap(log.Logger().Desugar(), time.RFC3339, false)) s.r.Use(ginzap.RecoveryWithZap(log.Logger().Desugar(), true)) log.SetLogLevel(s.db.GetSetting(db.SettingLogLevel)) //restore log level