improve: log format in global config init phase

This commit is contained in:
Mmx
2024-10-14 11:58:13 +08:00
parent 5b673af27b
commit 746b146a04
2 changed files with 18 additions and 12 deletions

View File

@@ -5,7 +5,6 @@ import (
"github.com/Mmx233/BitSrunLoginGo/internal/config/keys" "github.com/Mmx233/BitSrunLoginGo/internal/config/keys"
"github.com/Mmx233/BitSrunLoginGo/pkg/srun" "github.com/Mmx233/BitSrunLoginGo/pkg/srun"
"github.com/Mmx233/tool" "github.com/Mmx233/tool"
log "github.com/sirupsen/logrus"
"os" "os"
"time" "time"
) )
@@ -25,7 +24,9 @@ var (
) )
func init() { func init() {
logger := log.New().WithField(keys.LogComponent, "init") initLogPre()
logger := Logger.WithField(keys.LogComponent, "init")
reader := newReaderFromPath(flags.Path) reader := newReaderFromPath(flags.Path)
// 生成配置文件 // 生成配置文件
@@ -67,6 +68,6 @@ func init() {
Meta.Acid = flags.Acid Meta.Acid = flags.Acid
} }
initLog() initLogFinal()
initBackoff() initBackoff()
} }

View File

@@ -1,6 +1,7 @@
package config package config
import ( import (
"github.com/Mmx233/BitSrunLoginGo/internal/config/keys"
nested "github.com/antonfisher/nested-logrus-formatter" nested "github.com/antonfisher/nested-logrus-formatter"
"io" "io"
"os" "os"
@@ -12,13 +13,23 @@ import (
var Logger *log.Logger var Logger *log.Logger
func initLog() { func initLogPre() {
Logger = log.New() Logger = log.New()
//设置输出格式
Logger.SetFormatter(&nested.Formatter{
NoColors: Settings.Log.WriteFile,
TimestampFormat: "2006-01-02 15:04:05",
})
}
func initLogFinal() {
if Settings.Log.DebugLevel { if Settings.Log.DebugLevel {
Logger.SetLevel(log.DebugLevel) Logger.SetLevel(log.DebugLevel)
} }
logger := Logger.WithField(keys.LogComponent, "init log")
if Settings.Log.WriteFile { if Settings.Log.WriteFile {
//日志路径初始化与处理 //日志路径初始化与处理
if !strings.HasSuffix(Settings.Log.FilePath, "/") { if !strings.HasSuffix(Settings.Log.FilePath, "/") {
@@ -26,7 +37,7 @@ func initLog() {
} }
err := os.MkdirAll(Settings.Log.FilePath, os.ModePerm) err := os.MkdirAll(Settings.Log.FilePath, os.ModePerm)
if err != nil { if err != nil {
Logger.Fatalln(err) logger.Fatalln(err)
} }
if Settings.Log.FileName == "" { if Settings.Log.FileName == "" {
@@ -35,17 +46,11 @@ func initLog() {
f, err := os.OpenFile(Settings.Log.FilePath+Settings.Log.FileName, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644) f, err := os.OpenFile(Settings.Log.FilePath+Settings.Log.FileName, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
if err != nil { if err != nil {
Logger.Fatalln(err) logger.Fatalln(err)
} }
//设置双重输出 //设置双重输出
mw := io.MultiWriter(os.Stdout, f) mw := io.MultiWriter(os.Stdout, f)
Logger.SetOutput(mw) Logger.SetOutput(mw)
} }
//设置输出格式
Logger.SetFormatter(&nested.Formatter{
NoColors: Settings.Log.WriteFile,
TimestampFormat: "2006-01-02 15:04:05",
})
} }