feat(config): add log level configuration and update logging initialization, close #202

This commit is contained in:
krau
2026-04-14 09:41:02 +08:00
parent 159dba6224
commit 8f67f778a3
5 changed files with 35 additions and 13 deletions

View File

@@ -2,9 +2,9 @@ package cmd
import (
"context"
"fmt"
"os"
"path/filepath"
"strings"
"time"
"slices"
@@ -27,14 +27,27 @@ import (
func Run(cmd *cobra.Command, _ []string) {
ctx, cancel := context.WithCancel(cmd.Context())
logger := log.NewWithOptions(os.Stdout, log.Options{
Level: log.DebugLevel,
Level: log.InfoLevel,
ReportTimestamp: true,
TimeFormat: time.TimeOnly,
ReportCaller: true,
})
log.SetDefault(logger)
ctx = log.WithContext(ctx, logger)
exitChan, err := initAll(ctx, cmd)
configFile := config.GetConfigFile(cmd)
if err := config.Init(ctx, configFile); err != nil {
logger.Fatal("Init failed", "error", err)
}
level, err := log.ParseLevel(strings.TrimSpace(config.C().Log.Level))
if err != nil {
logger.Warn("Invalid log level, fallback to debug", "level", config.C().Log.Level, "error", err)
level = log.DebugLevel
}
logger.SetLevel(level)
exitChan, err := initAll(ctx)
if err != nil {
logger.Fatal("Init failed", "error", err)
}
@@ -51,11 +64,7 @@ func Run(cmd *cobra.Command, _ []string) {
cleanCache()
}
func initAll(ctx context.Context, cmd *cobra.Command) (<-chan struct{}, error) {
configFile := config.GetConfigFile(cmd)
if err := config.Init(ctx, configFile); err != nil {
return nil, fmt.Errorf("failed to load config: %w", err)
}
func initAll(ctx context.Context) (<-chan struct{}, error) {
cache.Init()
logger := log.FromContext(ctx)
i18n.Init(config.C().Lang)

View File

@@ -5,6 +5,10 @@ retry = 3 # 下载失败重试次数
threads = 4 # 单个任务下载使用的最大线程数
stream = false # 使用流式传输模式, 建议仅在硬盘空间十分有限时使用.
[log]
# 日志级别, 可选: debug, info, warn, error, fatal
level = "debug"
[telegram]
# Bot Token
# 更换 Bot Token 后请删除会话数据库文件 (默认路径为 data/session.db )

View File

@@ -17,6 +17,7 @@ func RegisterFlags(cmd *cobra.Command) {
flags.Bool("stream", false, "enable stream mode")
flags.Bool("no-clean-cache", false, "do not clean cache on exit")
flags.String("proxy", "", "proxy URL (http, https, socks5, socks5h)")
flags.String("log-level", "", "log level (trace/debug, info, warn, error, fatal)")
// Telegram 配置
flags.String("telegram-token", "", "telegram bot token")
@@ -54,6 +55,7 @@ func bindFlags(cmd *cobra.Command) {
viper.BindPFlag("stream", flags.Lookup("stream"))
viper.BindPFlag("no_clean_cache", flags.Lookup("no-clean-cache"))
viper.BindPFlag("proxy", flags.Lookup("proxy"))
viper.BindPFlag("log.level", flags.Lookup("log-level"))
// Telegram
viper.BindPFlag("telegram.token", flags.Lookup("telegram-token"))

5
config/log.go Normal file
View File

@@ -0,0 +1,5 @@
package config
type logConfig struct {
Level string `toml:"level" mapstructure:"level" json:"level"`
}

View File

@@ -23,6 +23,7 @@ type Config struct {
Threads int `toml:"threads" mapstructure:"threads" json:"threads"`
Stream bool `toml:"stream" mapstructure:"stream" json:"stream"`
Proxy string `toml:"proxy" mapstructure:"proxy" json:"proxy"`
Log logConfig `toml:"log" mapstructure:"log" json:"log"`
Aria2 aria2Config `toml:"aria2" mapstructure:"aria2" json:"aria2"`
API apiConfig `toml:"api" mapstructure:"api" json:"api"`
@@ -104,6 +105,7 @@ func Init(ctx context.Context, configFile ...string) error {
"workers": 3,
"retry": 3,
"threads": 4,
"log.level": "debug",
// 缓存配置
"cache.ttl": 86400,