improve: log fields
This commit is contained in:
@@ -2,6 +2,7 @@ package config
|
||||
|
||||
import (
|
||||
"github.com/Mmx233/BackoffCli/backoff"
|
||||
"github.com/Mmx233/BitSrunLoginGo/internal/config/keys"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -10,7 +11,7 @@ var BackoffConfig backoff.Conf
|
||||
func initBackoff() {
|
||||
setting := Settings.Backoff
|
||||
BackoffConfig = backoff.Conf{
|
||||
Logger: Logger,
|
||||
Logger: Logger.WithField(keys.LogComponent, "backoff"),
|
||||
DisableRecovery: true,
|
||||
InitialDuration: time.Duration(setting.InitialDuration) * time.Second,
|
||||
MaxDuration: time.Duration(setting.MaxDuration) * time.Second,
|
||||
|
||||
@@ -2,6 +2,7 @@ package config
|
||||
|
||||
import (
|
||||
"github.com/Mmx233/BitSrunLoginGo/internal/config/flags"
|
||||
"github.com/Mmx233/BitSrunLoginGo/internal/config/keys"
|
||||
"github.com/Mmx233/BitSrunLoginGo/pkg/srun"
|
||||
"github.com/Mmx233/tool"
|
||||
log "github.com/sirupsen/logrus"
|
||||
@@ -24,33 +25,34 @@ var (
|
||||
)
|
||||
|
||||
func init() {
|
||||
logger := log.New().WithField(keys.LogComponent, "init")
|
||||
reader := newReaderFromPath(flags.Path)
|
||||
|
||||
// 生成配置文件
|
||||
exist, err := tool.File.Exists(flags.Path)
|
||||
if err != nil {
|
||||
log.Fatalln("[init] 读取配置文件失败:", err)
|
||||
logger.Fatalln("读取配置文件失败:", err)
|
||||
} else if !exist {
|
||||
var data []byte
|
||||
data, err = reader.Marshal(&defaultConfig)
|
||||
if err != nil {
|
||||
log.Fatalln("[init] 生成配置文件失败:", err)
|
||||
logger.Fatalln("生成配置文件失败:", err)
|
||||
}
|
||||
if err = os.WriteFile(flags.Path, data, 0600); err != nil {
|
||||
log.Fatalln("[init] 写入配置文件失败:", err)
|
||||
logger.Fatalln("写入配置文件失败:", err)
|
||||
}
|
||||
log.Infoln("[init] 已生成配置文件,请编辑 '" + flags.Path + "' 然后重试")
|
||||
logger.Infoln("已生成配置文件,请编辑 '" + flags.Path + "' 然后重试")
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
// 读取配置文件
|
||||
data, err := os.ReadFile(flags.Path)
|
||||
if err != nil {
|
||||
log.Fatalln("[init] 读取配置失败:", err)
|
||||
logger.Fatalln("读取配置失败:", err)
|
||||
}
|
||||
var fileConf ConfFromFile
|
||||
if err = reader.Unmarshal(data, &fileConf); err != nil {
|
||||
log.Fatalln("[init] 解析配置失败:", err)
|
||||
logger.Fatalln("解析配置失败:", err)
|
||||
}
|
||||
Form = &fileConf.Form
|
||||
Meta = &fileConf.Meta
|
||||
|
||||
6
internal/config/keys/log.go
Normal file
6
internal/config/keys/log.go
Normal file
@@ -0,0 +1,6 @@
|
||||
package keys
|
||||
|
||||
const (
|
||||
LogComponent = "comp"
|
||||
LogLoginModule = "mod"
|
||||
)
|
||||
@@ -45,7 +45,6 @@ func initLog() {
|
||||
|
||||
//设置输出格式
|
||||
Logger.SetFormatter(&nested.Formatter{
|
||||
HideKeys: true,
|
||||
NoColors: Settings.Log.WriteFile,
|
||||
TimestampFormat: "2006-01-02 15:04:05",
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user