From 746b146a04c30809c5ef9f9b46147da2e000b274 Mon Sep 17 00:00:00 2001
From: Mmx <green.dusk8264@fastmail.com>
Date: Mon, 14 Oct 2024 11:58:13 +0800
Subject: [PATCH] improve: log format in global config init phase

---
 internal/config/config.go |  7 ++++---
 internal/config/log.go    | 23 ++++++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/internal/config/config.go b/internal/config/config.go
index 08ffa32..3c6db57 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -5,7 +5,6 @@ import (
 	"github.com/Mmx233/BitSrunLoginGo/internal/config/keys"
 	"github.com/Mmx233/BitSrunLoginGo/pkg/srun"
 	"github.com/Mmx233/tool"
-	log "github.com/sirupsen/logrus"
 	"os"
 	"time"
 )
@@ -25,7 +24,9 @@ var (
 )
 
 func init() {
-	logger := log.New().WithField(keys.LogComponent, "init")
+	initLogPre()
+
+	logger := Logger.WithField(keys.LogComponent, "init")
 	reader := newReaderFromPath(flags.Path)
 
 	// 生成配置文件
@@ -67,6 +68,6 @@ func init() {
 		Meta.Acid = flags.Acid
 	}
 
-	initLog()
+	initLogFinal()
 	initBackoff()
 }
diff --git a/internal/config/log.go b/internal/config/log.go
index 55d53a3..3653017 100644
--- a/internal/config/log.go
+++ b/internal/config/log.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"github.com/Mmx233/BitSrunLoginGo/internal/config/keys"
 	nested "github.com/antonfisher/nested-logrus-formatter"
 	"io"
 	"os"
@@ -12,13 +13,23 @@ import (
 
 var Logger *log.Logger
 
-func initLog() {
+func initLogPre() {
 	Logger = log.New()
 
+	//设置输出格式
+	Logger.SetFormatter(&nested.Formatter{
+		NoColors:        Settings.Log.WriteFile,
+		TimestampFormat: "2006-01-02 15:04:05",
+	})
+}
+
+func initLogFinal() {
 	if Settings.Log.DebugLevel {
 		Logger.SetLevel(log.DebugLevel)
 	}
 
+	logger := Logger.WithField(keys.LogComponent, "init log")
+
 	if Settings.Log.WriteFile {
 		//日志路径初始化与处理
 		if !strings.HasSuffix(Settings.Log.FilePath, "/") {
@@ -26,7 +37,7 @@ func initLog() {
 		}
 		err := os.MkdirAll(Settings.Log.FilePath, os.ModePerm)
 		if err != nil {
-			Logger.Fatalln(err)
+			logger.Fatalln(err)
 		}
 
 		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)
 		if err != nil {
-			Logger.Fatalln(err)
+			logger.Fatalln(err)
 		}
 
 		//设置双重输出
 		mw := io.MultiWriter(os.Stdout, f)
 		Logger.SetOutput(mw)
 	}
-
-	//设置输出格式
-	Logger.SetFormatter(&nested.Formatter{
-		NoColors:        Settings.Log.WriteFile,
-		TimestampFormat: "2006-01-02 15:04:05",
-	})
 }