zap

config/config.yaml

@@ -160,8 +160,9 @@ log:
   rotationTime: 24
   remainRotationCount: 2 #日志数量
   #日志级别 6表示全都打印，测试阶段建议设置为6
-  remainLogLevel: -1
-  stderr: true
+  remainLogLevel: 6
+  isStdout: true
+  isJson: true
   withStack: false
   elasticSearchSwitch: false
   elasticSearchAddr: [ 127.0.0.1:9201 ]

pkg/common/cmd/root.go

@@ -26,7 +26,7 @@ func NewRootCmd(name string) (rootCmd *RootCmd) {
 			if err := rootCmd.getConfFromCmdAndInit(cmd); err != nil {
 				return err
 			}
-			return log.InitFromConfig(name, config.Config.Log.RemainLogLevel)
+			return log.InitFromConfig(name, config.Config.Log.RemainLogLevel, config.Config.Log.IsStdout, config.Config.Log.IsJson)
 		},
 	}
 	rootCmd.Command = c

pkg/common/config/config.go

@@ -187,13 +187,13 @@ type config struct {
 		RotationTime          int      `yaml:"rotationTime"`
 		RemainRotationCount   uint     `yaml:"remainRotationCount"`
 		RemainLogLevel        int      `yaml:"remainLogLevel"`
-		Stderr                bool     `yaml:"stderr"`
+		IsStdout              bool     `yaml:"isStdout"`
 		WithStack             bool     `yaml:"withStack"`
 		ElasticSearchSwitch   bool     `yaml:"elasticSearchSwitch"`
 		ElasticSearchAddr     []string `yaml:"elasticSearchAddr"`
 		ElasticSearchUser     string   `yaml:"elasticSearchUser"`
 		ElasticSearchPassword string   `yaml:"elasticSearchPassword"`
-		isJson                bool     `yaml:"isJson"`
+		IsJson                bool     `yaml:"isJson"`
 	}
 	ModuleName struct {
 		LongConnSvrName string `yaml:"longConnSvrName"`

pkg/common/log/zap.go

@@ -30,8 +30,8 @@ var (
 )
 
 // InitFromConfig initializes a Zap-based logger
-func InitFromConfig(name string, logLevel int) error {
-	l, err := NewZapLogger(logLevel)
+func InitFromConfig(name string, logLevel int, isStdout bool, isJson bool) error {
+	l, err := NewZapLogger(logLevel, isStdout, isJson)
 	if err != nil {
 		return err
 	}
@@ -59,19 +59,21 @@ type ZapLogger struct {
 	zap *zap.SugaredLogger
 }
 
-func NewZapLogger(logLevel int) (*ZapLogger, error) {
+func NewZapLogger(logLevel int, isStdout bool, isJson bool) (*ZapLogger, error) {
 	zapConfig := zap.Config{
 		Level:             zap.NewAtomicLevelAt(logLevelMap[logLevel]),
-		Encoding:          "json",
 		EncoderConfig:     zap.NewProductionEncoderConfig(),
 		InitialFields:     map[string]interface{}{"PID": os.Getegid()},
 		DisableStacktrace: true,
 	}
-	if config.Config.Log.Stderr {
-		zapConfig.OutputPaths = append(zapConfig.OutputPaths, "stderr")
+	if isJson {
+		zapConfig.Encoding = "json"
+	}
+	if isStdout {
+		zapConfig.OutputPaths = append(zapConfig.OutputPaths, "stdout", "stderr")
 	}
 	zl := &ZapLogger{}
-	opts, err := zl.cores()
+	opts, err := zl.cores(logLevel, isStdout)
 	if err != nil {
 		return nil, err
 	}
@@ -83,7 +85,7 @@ func NewZapLogger(logLevel int) (*ZapLogger, error) {
 	return zl, nil
 }
 
-func (l *ZapLogger) cores() (zap.Option, error) {
+func (l *ZapLogger) cores(logLevel int, isStdout bool) (zap.Option, error) {
 	c := zap.NewProductionEncoderConfig()
 	c.EncodeTime = zapcore.ISO8601TimeEncoder
 	c.EncodeDuration = zapcore.SecondsDurationEncoder
@@ -101,11 +103,11 @@ func (l *ZapLogger) cores() (zap.Option, error) {
 	var cores []zapcore.Core
 	if config.Config.Log.StorageLocation != "" {
 		cores = []zapcore.Core{
-			zapcore.NewCore(fileEncoder, writer, zap.NewAtomicLevelAt(zapcore.Level(config.Config.Log.RemainLogLevel))),
+			zapcore.NewCore(fileEncoder, writer, zap.NewAtomicLevelAt(zapcore.Level(logLevel))),
 		}
 	}
-	if config.Config.Log.Stderr {
-		cores = append(cores, zapcore.NewCore(fileEncoder, zapcore.Lock(os.Stdout), zap.NewAtomicLevelAt(zapcore.Level(config.Config.Log.RemainLogLevel))))
+	if isStdout {
+		cores = append(cores, zapcore.NewCore(fileEncoder, zapcore.Lock(os.Stdout), zap.NewAtomicLevelAt(zapcore.Level(logLevel))))
 	}
 	return zap.WrapCore(func(c zapcore.Core) zapcore.Core {
 		return zapcore.NewTee(cores...)