Browse Source

add .gitignore ignore gva files, and optimization zap.go:Repair split file is windows error

main
SliverHorn 4 years ago
parent
commit
e7f6a05ea5
  1. 1
      .gitignore
  2. 22
      server/core/zap.go

1
.gitignore

@ -24,6 +24,7 @@ yarn-error.log*
go.sum go.sum
/server/log/ /server/log/
/server/gva
/server/latest_log /server/latest_log
*.iml *.iml

22
server/core/zap.go

@ -8,14 +8,11 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"go.uber.org/zap/zapcore" "go.uber.org/zap/zapcore"
"os" "os"
"path"
"time" "time"
) )
var (
err error
level zapcore.Level
writer zapcore.WriteSyncer
)
var level zapcore.Level
func Zap() (logger *zap.Logger) { func Zap() (logger *zap.Logger) {
if ok, _ := utils.PathExists(global.GVA_CONFIG.Zap.Director); !ok { // 判断是否有Director文件夹 if ok, _ := utils.PathExists(global.GVA_CONFIG.Zap.Director); !ok { // 判断是否有Director文件夹
@ -42,12 +39,6 @@ func Zap() (logger *zap.Logger) {
level = zap.InfoLevel level = zap.InfoLevel
} }
writer, err = getWriteSyncer() // 使用file-rotatelogs进行日志分割
if err != nil {
fmt.Printf("Get Write Syncer Failed err:%v", err.Error())
return
}
if level == zap.DebugLevel || level == zap.ErrorLevel { if level == zap.DebugLevel || level == zap.ErrorLevel {
logger = zap.New(getEncoderCore(), zap.AddStacktrace(level)) logger = zap.New(getEncoderCore(), zap.AddStacktrace(level))
} else { } else {
@ -62,7 +53,7 @@ func Zap() (logger *zap.Logger) {
// getWriteSyncer zap logger中加入file-rotatelogs // getWriteSyncer zap logger中加入file-rotatelogs
func getWriteSyncer() (zapcore.WriteSyncer, error) { func getWriteSyncer() (zapcore.WriteSyncer, error) {
fileWriter, err := zaprotatelogs.New( fileWriter, err := zaprotatelogs.New(
global.GVA_CONFIG.Zap.Director+string(os.PathSeparator)+"%Y-%m-%d.log",
path.Join(global.GVA_CONFIG.Zap.Director, "%Y-%m-%d.log"),
zaprotatelogs.WithLinkName(global.GVA_CONFIG.Zap.LinkName), zaprotatelogs.WithLinkName(global.GVA_CONFIG.Zap.LinkName),
zaprotatelogs.WithMaxAge(7*24*time.Hour), zaprotatelogs.WithMaxAge(7*24*time.Hour),
zaprotatelogs.WithRotationTime(24*time.Hour), zaprotatelogs.WithRotationTime(24*time.Hour),
@ -97,6 +88,8 @@ func getEncoderConfig() (config zapcore.EncoderConfig) {
config.EncodeLevel = zapcore.CapitalLevelEncoder config.EncodeLevel = zapcore.CapitalLevelEncoder
case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalColorLevelEncoder": // 大写编码器带颜色 case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalColorLevelEncoder": // 大写编码器带颜色
config.EncodeLevel = zapcore.CapitalColorLevelEncoder config.EncodeLevel = zapcore.CapitalColorLevelEncoder
default:
config.EncodeLevel = zapcore.LowercaseLevelEncoder
} }
return config return config
} }
@ -111,6 +104,11 @@ func getEncoder() zapcore.Encoder {
// getEncoderCore 获取Encoder的zapcore.Core // getEncoderCore 获取Encoder的zapcore.Core
func getEncoderCore() (core zapcore.Core) { func getEncoderCore() (core zapcore.Core) {
writer, err := getWriteSyncer() // 使用file-rotatelogs进行日志分割
if err != nil {
fmt.Printf("Get Write Syncer Failed err:%v", err.Error())
return
}
return zapcore.NewCore(getEncoder(), writer, level) return zapcore.NewCore(getEncoder(), writer, level)
} }

Loading…
Cancel
Save