chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-03 04:50:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(logging): refactor ConfigureLogOutput to accept config object and adjust log directory handling

Browse Source
This commit is contained in:
Luis Pater
2025-12-30 10:28:25 +08:00
parent 50e6d845f4
commit bc866bac49
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/server/main.go
View File

@@ -405,7 +405,7 @@ func main() {
usage.SetStatisticsEnabled(cfg.UsageStatisticsEnabled) usage.SetStatisticsEnabled(cfg.UsageStatisticsEnabled)
coreauth.SetQuotaCooldownDisabled(cfg.DisableCooling) coreauth.SetQuotaCooldownDisabled(cfg.DisableCooling)
if err = logging.ConfigureLogOutput(cfg.LoggingToFile, cfg.LogsMaxTotalSizeMB); err != nil { if err = logging.ConfigureLogOutput(cfg); err != nil {
log.Errorf("failed to configure log output: %v", err) log.Errorf("failed to configure log output: %v", err)
return return
} }

2
internal/api/server.go
View File

@@ -856,7 +856,7 @@ func (s *Server) UpdateClients(cfg *config.Config) {
} }
if oldCfg == nil || oldCfg.LoggingToFile != cfg.LoggingToFile || oldCfg.LogsMaxTotalSizeMB != cfg.LogsMaxTotalSizeMB { if oldCfg == nil || oldCfg.LoggingToFile != cfg.LoggingToFile || oldCfg.LogsMaxTotalSizeMB != cfg.LogsMaxTotalSizeMB {
if err := logging.ConfigureLogOutput(cfg.LoggingToFile, cfg.LogsMaxTotalSizeMB); err != nil { if err := logging.ConfigureLogOutput(cfg); err != nil {
log.Errorf("failed to reconfigure log output: %v", err) log.Errorf("failed to reconfigure log output: %v", err)
} else { } else {
if oldCfg == nil { if oldCfg == nil {

18
internal/logging/global_logger.go
View File

@@ -10,6 +10,7 @@ import (
"sync" "sync"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
"github.com/router-for-me/CLIProxyAPI/v6/internal/util" "github.com/router-for-me/CLIProxyAPI/v6/internal/util"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"gopkg.in/natefinch/lumberjack.v2" "gopkg.in/natefinch/lumberjack.v2"
@@ -86,7 +87,7 @@ func SetupBaseLogger() {
// ConfigureLogOutput switches the global log destination between rotating files and stdout. // ConfigureLogOutput switches the global log destination between rotating files and stdout.
// When logsMaxTotalSizeMB > 0, a background cleaner removes the oldest log files in the logs directory // When logsMaxTotalSizeMB > 0, a background cleaner removes the oldest log files in the logs directory
// until the total size is within the limit. // until the total size is within the limit.
func ConfigureLogOutput(loggingToFile bool, logsMaxTotalSizeMB int) error { func ConfigureLogOutput(cfg *config.Config) error {
SetupBaseLogger() SetupBaseLogger()
writerMu.Lock() writerMu.Lock()
@@ -95,19 +96,12 @@ func ConfigureLogOutput(loggingToFile bool, logsMaxTotalSizeMB int) error {
logDir := "logs" logDir := "logs"
if base := util.WritablePath(); base != "" { if base := util.WritablePath(); base != "" {
logDir = filepath.Join(base, "logs") logDir = filepath.Join(base, "logs")
} else if loggingToFile { } else {
// When logging to file is enabled but WRITABLE_PATH is not set, logDir = filepath.Join(cfg.AuthDir, "logs")
// use a default writable location to avoid errors on read-only filesystems
// (e.g., Homebrew installations on macOS).
home, err := os.UserHomeDir()
if err != nil {
return fmt.Errorf("logging: failed to determine user home directory for fallback log path: %w", err)
}
logDir = filepath.Join(home, ".cliproxyapi", "logs")
} }
protectedPath := "" protectedPath := ""
if loggingToFile { if cfg.LoggingToFile {
if err := os.MkdirAll(logDir, 0o755); err != nil { if err := os.MkdirAll(logDir, 0o755); err != nil {
return fmt.Errorf("logging: failed to create log directory: %w", err) return fmt.Errorf("logging: failed to create log directory: %w", err)
} }
@@ -131,7 +125,7 @@ func ConfigureLogOutput(loggingToFile bool, logsMaxTotalSizeMB int) error {
log.SetOutput(os.Stdout) log.SetOutput(os.Stdout)
} }
configureLogDirCleanerLocked(logDir, logsMaxTotalSizeMB, protectedPath) configureLogDirCleanerLocked(logDir, cfg.LogsMaxTotalSizeMB, protectedPath)
return nil return nil
} }