统一代码风格

Author: 刘翔鹏

log/logger/logger.go

@@ -41,14 +41,18 @@ func InitLog(logHandler string, logDir string, logLevel string, segment bool) (*
 	}
 
 	if segment {
-		return LogSegment(logger, logDir, "snow")
+		hook, err := NewLfsHook(logger, logDir, "snow")
+		if err != nil {
+			return nil, err
+		}
+		logger.Hooks.Add(hook)
+	} else {
+		rollHook, err := NewRollHook(logger, logDir, "snow")
+		if err != nil {
+			return nil, err
+		}
+		logger.Hooks.Add(rollHook)
 	}
 
-	rollHook, err := NewRollHook(logger, logDir, "snow")
-	if err != nil {
-		return nil, err
-	}
-	logger.Hooks.Add(rollHook)
-
 	return logger, nil
 }

log/logger/segment.go

@@ -9,56 +9,53 @@ import (
 	"time"
 )
 
-func LogSegment(l *logrus.Logger, logDir, name string) (*logrus.Logger, error) {
+func NewLfsHook(l *logrus.Logger, logDir, name string) (*lfshook.LfsHook, error) {
 	var (
 		err         error
 		infoWriter  io.Writer
 		warnWriter  io.Writer
 		errorWriter io.Writer
 	)
 
-	if l.GetLevel() >= logrus.DebugLevel {
-		infoPath := fmt.Sprintf("%s/%s.%s", logDir, name, "INFO.%Y%m%d.log")
-		linkInfoPath := fmt.Sprintf("%s/%s.%s", logDir, name, "INFO.log")
-		infoWriter, err = rotatelogs.New(
-			infoPath,
-			rotatelogs.WithLinkName(linkInfoPath),
-			rotatelogs.WithMaxAge(time.Duration(86400)*time.Second),
-			rotatelogs.WithRotationTime(time.Duration(604800)*time.Second),
-		)
-		if err != nil {
-			return nil, err
-		}
+	infoPath := fmt.Sprintf("%s/%s.%s", logDir, name, "INFO.%Y%m%d.log")
+	linkInfoPath := fmt.Sprintf("%s/%s.%s", logDir, name, "INFO.log")
+	infoWriter, err = rotatelogs.New(
+		infoPath,
+		rotatelogs.WithLinkName(linkInfoPath),
+		rotatelogs.WithMaxAge(time.Duration(86400)*time.Second),
+		rotatelogs.WithRotationTime(time.Duration(604800)*time.Second),
+	)
+	if err != nil {
+		return nil, err
 	}
-	if l.GetLevel() >= logrus.WarnLevel {
-		warnPath := fmt.Sprintf("%s/%s.%s", logDir, name, "WARN.%Y%m%d.log")
-		linkWarnPath := fmt.Sprintf("%s/%s.%s", logDir, name, "WARN.log")
-		warnWriter, err = rotatelogs.New(
-			warnPath,
-			rotatelogs.WithLinkName(linkWarnPath),
-			rotatelogs.WithMaxAge(time.Duration(86400)*time.Second),
-			rotatelogs.WithRotationTime(time.Duration(604800)*time.Second),
-		)
-		if err != nil {
-			return nil, err
-		}
+
+	warnPath := fmt.Sprintf("%s/%s.%s", logDir, name, "WARN.%Y%m%d.log")
+	linkWarnPath := fmt.Sprintf("%s/%s.%s", logDir, name, "WARN.log")
+	warnWriter, err = rotatelogs.New(
+		warnPath,
+		rotatelogs.WithLinkName(linkWarnPath),
+		rotatelogs.WithMaxAge(time.Duration(86400)*time.Second),
+		rotatelogs.WithRotationTime(time.Duration(604800)*time.Second),
+	)
+	if err != nil {
+		return nil, err
 	}
-	if l.GetLevel() >= logrus.ErrorLevel {
-		errorPath := fmt.Sprintf("%s/%s.%s", logDir, name, "ERROR.%Y%m%d.log")
-		linkErrorPath := fmt.Sprintf("%s/%s.%s", logDir, name, "ERROR.log")
-		errorWriter, err = rotatelogs.New(
-			errorPath,
-			rotatelogs.WithLinkName(linkErrorPath),
-			rotatelogs.WithMaxAge(time.Duration(86400)*time.Second),
-			rotatelogs.WithRotationTime(time.Duration(604800)*time.Second),
-		)
-		if err != nil {
-			return nil, err
-		}
+
+	errorPath := fmt.Sprintf("%s/%s.%s", logDir, name, "ERROR.%Y%m%d.log")
+	linkErrorPath := fmt.Sprintf("%s/%s.%s", logDir, name, "ERROR.log")
+	errorWriter, err = rotatelogs.New(
+		errorPath,
+		rotatelogs.WithLinkName(linkErrorPath),
+		rotatelogs.WithMaxAge(time.Duration(86400)*time.Second),
+		rotatelogs.WithRotationTime(time.Duration(604800)*time.Second),
+	)
+	if err != nil {
+		return nil, err
 	}
 
 	writerMap := lfshook.WriterMap{}
 	if infoWriter != nil {
+		writerMap[logrus.TraceLevel] = infoWriter
 		writerMap[logrus.DebugLevel] = infoWriter
 		writerMap[logrus.InfoLevel] = infoWriter
 	}
@@ -67,8 +64,9 @@ func LogSegment(l *logrus.Logger, logDir, name string) (*logrus.Logger, error) {
 	}
 	if errorWriter != nil {
 		writerMap[logrus.ErrorLevel] = errorWriter
+		writerMap[logrus.FatalLevel] = errorWriter
+		writerMap[logrus.PanicLevel] = errorWriter
 	}
 
-	l.Hooks.Add(lfshook.NewHook(writerMap, &logrus.JSONFormatter{}))
-	return l, nil
+	return lfshook.NewHook(writerMap, &logrus.JSONFormatter{}), nil
 }