@@ -8,14 +8,11 @@ import (
8
8
"go.uber.org/zap"
9
9
"go.uber.org/zap/zapcore"
10
10
"os"
11
+ "path"
11
12
"time"
12
13
)
13
14
14
- var (
15
- err error
16
- level zapcore.Level
17
- writer zapcore.WriteSyncer
18
- )
15
+ var level zapcore.Level
19
16
20
17
func Zap () (logger * zap.Logger ) {
21
18
if ok , _ := utils .PathExists (global .GVA_CONFIG .Zap .Director ); ! ok { // 判断是否有Director文件夹
@@ -42,12 +39,6 @@ func Zap() (logger *zap.Logger) {
42
39
level = zap .InfoLevel
43
40
}
44
41
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
-
51
42
if level == zap .DebugLevel || level == zap .ErrorLevel {
52
43
logger = zap .New (getEncoderCore (), zap .AddStacktrace (level ))
53
44
} else {
@@ -62,7 +53,7 @@ func Zap() (logger *zap.Logger) {
62
53
// getWriteSyncer zap logger中加入file-rotatelogs
63
54
func getWriteSyncer () (zapcore.WriteSyncer , error ) {
64
55
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" ) ,
66
57
zaprotatelogs .WithLinkName (global .GVA_CONFIG .Zap .LinkName ),
67
58
zaprotatelogs .WithMaxAge (7 * 24 * time .Hour ),
68
59
zaprotatelogs .WithRotationTime (24 * time .Hour ),
@@ -97,6 +88,8 @@ func getEncoderConfig() (config zapcore.EncoderConfig) {
97
88
config .EncodeLevel = zapcore .CapitalLevelEncoder
98
89
case global .GVA_CONFIG .Zap .EncodeLevel == "CapitalColorLevelEncoder" : // 大写编码器带颜色
99
90
config .EncodeLevel = zapcore .CapitalColorLevelEncoder
91
+ default :
92
+ config .EncodeLevel = zapcore .LowercaseLevelEncoder
100
93
}
101
94
return config
102
95
}
@@ -111,6 +104,11 @@ func getEncoder() zapcore.Encoder {
111
104
112
105
// getEncoderCore 获取Encoder的zapcore.Core
113
106
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
+ }
114
112
return zapcore .NewCore (getEncoder (), writer , level )
115
113
}
116
114
0 commit comments