Browse Source

添加日志级别封装

yjp 3 years ago
parent
commit
b3f425105b
2 changed files with 28 additions and 7 deletions
  1. 26 4
      fslog_instance.go
  2. 2 3
      fslog_instance_test.go

+ 26 - 4
fslog_instance.go

@@ -10,7 +10,29 @@ import (
 	"sync"
 	"sync"
 )
 )
 
 
-var LoggerLever = zapcore.DebugLevel
+const (
+	LoggerLevelInfo  = "info"
+	LoggerLevelError = "error"
+	LoggerLevelDebug = "debug"
+	LoggerLevelWarn  = "Warn"
+)
+
+var LoggerLever = LoggerLevelDebug
+
+func chooseLoggerLever() zapcore.Level {
+	switch LoggerLever {
+	case LoggerLevelInfo:
+		return zapcore.InfoLevel
+	case LoggerLevelError:
+		return zapcore.ErrorLevel
+	case LoggerLevelDebug:
+		return zapcore.DebugLevel
+	case LoggerLevelWarn:
+		return zapcore.WarnLevel
+	default:
+		return zapcore.DebugLevel
+	}
+}
 
 
 var logger *zap.Logger
 var logger *zap.Logger
 var initLoggerOnce sync.Once
 var initLoggerOnce sync.Once
@@ -36,8 +58,8 @@ func lazyInitialize() {
 
 
 		encoder := zapcore.NewConsoleEncoder(developmentEncoderConfig)
 		encoder := zapcore.NewConsoleEncoder(developmentEncoderConfig)
 		core := zapcore.NewTee(
 		core := zapcore.NewTee(
-			zapcore.NewCore(encoder, zapcore.AddSync(file), LoggerLever),
-			zapcore.NewCore(encoder, zapcore.AddSync(os.Stdout), LoggerLever),
+			zapcore.NewCore(encoder, zapcore.AddSync(file), chooseLoggerLever()),
+			zapcore.NewCore(encoder, zapcore.AddSync(os.Stdout), chooseLoggerLever()),
 		)
 		)
 
 
 		logger = zap.New(core, zap.AddCaller())
 		logger = zap.New(core, zap.AddCaller())
@@ -62,7 +84,7 @@ func Debug(serviceName string, funcName string, callName string, message string)
 	logger.Debug(message, callerFields...)
 	logger.Debug(message, callerFields...)
 }
 }
 
 
-func Warning(serviceName string, funcName string, callName string, message string) {
+func Warn(serviceName string, funcName string, callName string, message string) {
 	lazyInitialize()
 	lazyInitialize()
 	callerFields := getCallerInfoForLog(serviceName, funcName, callName)
 	callerFields := getCallerInfoForLog(serviceName, funcName, callName)
 	logger.Warn(message, callerFields...)
 	logger.Warn(message, callerFields...)

+ 2 - 3
fslog_instance_test.go

@@ -1,15 +1,14 @@
 package fslog
 package fslog
 
 
 import (
 import (
-	"go.uber.org/zap/zapcore"
 	"testing"
 	"testing"
 )
 )
 
 
 func TestFSLogInstanceToConsole(t *testing.T) {
 func TestFSLogInstanceToConsole(t *testing.T) {
-	LoggerLever = zapcore.DebugLevel
+	LoggerLever = LoggerLevelDebug
 
 
 	Error("demo", "TestFSLogInstanceToConsole", "test", "error test")
 	Error("demo", "TestFSLogInstanceToConsole", "test", "error test")
 	Debug("demo", "TestFSLogInstanceToConsole", "test", "debug test")
 	Debug("demo", "TestFSLogInstanceToConsole", "test", "debug test")
 	Info("demo", "TestFSLogInstanceToConsole", "test", "info test")
 	Info("demo", "TestFSLogInstanceToConsole", "test", "info test")
-	Warning("demo", "TestFSLogInstanceToConsole", "test", "warning test")
+	Warn("demo", "TestFSLogInstanceToConsole", "test", "warning test")
 }
 }