feat 废弃jwt
This commit is contained in:
@@ -1,13 +1,14 @@
|
||||
package log
|
||||
|
||||
import (
|
||||
"git.hlsq.asia/mmorpg/service-common/config"
|
||||
"github.com/natefinch/lumberjack"
|
||||
"go.uber.org/zap"
|
||||
"go.uber.org/zap/zapcore"
|
||||
"os"
|
||||
)
|
||||
|
||||
func Init(debug bool, maxSize, maxBackups, maxAge int32, level string) {
|
||||
func Init(cfg *config.LogConfig) {
|
||||
// 格式配置
|
||||
jsonConfig := zapcore.EncoderConfig{
|
||||
MessageKey: "M",
|
||||
@@ -30,19 +31,19 @@ func Init(debug bool, maxSize, maxBackups, maxAge int32, level string) {
|
||||
|
||||
// 日志输出到控制台和文件
|
||||
writeSyncer := []zapcore.WriteSyncer{zapcore.AddSync(os.Stdout)}
|
||||
if !debug {
|
||||
if !cfg.Debug {
|
||||
writeSyncer = append(writeSyncer, zapcore.AddSync(&lumberjack.Logger{
|
||||
Filename: "./logs/log.log", // 日志文件位置
|
||||
MaxSize: int(maxSize), // 最大文件大小(MB)
|
||||
MaxBackups: int(maxBackups), // 保留旧文件的最大个数
|
||||
MaxAge: int(maxAge), // 保留旧文件的最大天数
|
||||
Compress: false, // 是否压缩/归档旧文件
|
||||
Filename: "./logs/log.log", // 日志文件位置
|
||||
MaxSize: int(cfg.MaxSize), // 最大文件大小(MB)
|
||||
MaxBackups: int(cfg.MaxBackups), // 保留旧文件的最大个数
|
||||
MaxAge: int(cfg.MaxAge), // 保留旧文件的最大天数
|
||||
Compress: false, // 是否压缩/归档旧文件
|
||||
LocalTime: true,
|
||||
}))
|
||||
}
|
||||
|
||||
var encoder zapcore.Encoder
|
||||
if debug {
|
||||
if cfg.Debug {
|
||||
encoder = zapcore.NewConsoleEncoder(jsonConfig)
|
||||
} else {
|
||||
encoder = zapcore.NewJSONEncoder(jsonConfig)
|
||||
@@ -50,9 +51,9 @@ func Init(debug bool, maxSize, maxBackups, maxAge int32, level string) {
|
||||
logger := zap.New(zapcore.NewCore(
|
||||
encoder,
|
||||
zapcore.NewMultiWriteSyncer(writeSyncer...),
|
||||
zap.NewAtomicLevelAt(GetLogLevel(level)),
|
||||
zap.NewAtomicLevelAt(GetLogLevel(cfg.Level)),
|
||||
))
|
||||
if debug {
|
||||
if cfg.Debug {
|
||||
logger = logger.WithOptions(
|
||||
zap.AddCaller(),
|
||||
zap.AddCallerSkip(1),
|
||||
|
||||
Reference in New Issue
Block a user