Skip to content

Commit e7f6a05

Browse files
committed
add .gitignore ignore gva files, and optimization zap.go:Repair split file is windows error
1 parent c2145dd commit e7f6a05

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ yarn-error.log*
2424

2525
go.sum
2626
/server/log/
27+
/server/gva
2728
/server/latest_log
2829

2930
*.iml

server/core/zap.go

+10-12
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ import (
88
"go.uber.org/zap"
99
"go.uber.org/zap/zapcore"
1010
"os"
11+
"path"
1112
"time"
1213
)
1314

14-
var (
15-
err error
16-
level zapcore.Level
17-
writer zapcore.WriteSyncer
18-
)
15+
var level zapcore.Level
1916

2017
func Zap() (logger *zap.Logger) {
2118
if ok, _ := utils.PathExists(global.GVA_CONFIG.Zap.Director); !ok { // 判断是否有Director文件夹
@@ -42,12 +39,6 @@ func Zap() (logger *zap.Logger) {
4239
level = zap.InfoLevel
4340
}
4441

45-
writer, err = getWriteSyncer() // 使用file-rotatelogs进行日志分割
46-
if err != nil {
47-
fmt.Printf("Get Write Syncer Failed err:%v", err.Error())
48-
return
49-
}
50-
5142
if level == zap.DebugLevel || level == zap.ErrorLevel {
5243
logger = zap.New(getEncoderCore(), zap.AddStacktrace(level))
5344
} else {
@@ -62,7 +53,7 @@ func Zap() (logger *zap.Logger) {
6253
// getWriteSyncer zap logger中加入file-rotatelogs
6354
func getWriteSyncer() (zapcore.WriteSyncer, error) {
6455
fileWriter, err := zaprotatelogs.New(
65-
global.GVA_CONFIG.Zap.Director+string(os.PathSeparator)+"%Y-%m-%d.log",
56+
path.Join(global.GVA_CONFIG.Zap.Director, "%Y-%m-%d.log"),
6657
zaprotatelogs.WithLinkName(global.GVA_CONFIG.Zap.LinkName),
6758
zaprotatelogs.WithMaxAge(7*24*time.Hour),
6859
zaprotatelogs.WithRotationTime(24*time.Hour),
@@ -97,6 +88,8 @@ func getEncoderConfig() (config zapcore.EncoderConfig) {
9788
config.EncodeLevel = zapcore.CapitalLevelEncoder
9889
case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalColorLevelEncoder": // 大写编码器带颜色
9990
config.EncodeLevel = zapcore.CapitalColorLevelEncoder
91+
default:
92+
config.EncodeLevel = zapcore.LowercaseLevelEncoder
10093
}
10194
return config
10295
}
@@ -111,6 +104,11 @@ func getEncoder() zapcore.Encoder {
111104

112105
// getEncoderCore 获取Encoder的zapcore.Core
113106
func getEncoderCore() (core zapcore.Core) {
107+
writer, err := getWriteSyncer() // 使用file-rotatelogs进行日志分割
108+
if err != nil {
109+
fmt.Printf("Get Write Syncer Failed err:%v", err.Error())
110+
return
111+
}
114112
return zapcore.NewCore(getEncoder(), writer, level)
115113
}
116114

0 commit comments

Comments
 (0)