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

chore(watcher): add YAML serialization for config change tracking and improve quota-exceeded debug logs

Browse Source
This commit is contained in:
Luis Pater
2025-10-13 13:32:43 +08:00
parent 3be6175aec
commit 80f6d6fe7c
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/watcher/watcher.go
View File

@@ -20,19 +20,13 @@ import (
"time" "time"
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
// "github.com/router-for-me/CLIProxyAPI/v6/internal/auth/claude"
// "github.com/router-for-me/CLIProxyAPI/v6/internal/auth/codex"
// "github.com/router-for-me/CLIProxyAPI/v6/internal/auth/gemini"
// "github.com/router-for-me/CLIProxyAPI/v6/internal/auth/qwen"
// "github.com/router-for-me/CLIProxyAPI/v6/internal/client"
"github.com/router-for-me/CLIProxyAPI/v6/internal/config" "github.com/router-for-me/CLIProxyAPI/v6/internal/config"
// "github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces" "gopkg.in/yaml.v3"
"github.com/router-for-me/CLIProxyAPI/v6/internal/util" "github.com/router-for-me/CLIProxyAPI/v6/internal/util"
sdkAuth "github.com/router-for-me/CLIProxyAPI/v6/sdk/auth" sdkAuth "github.com/router-for-me/CLIProxyAPI/v6/sdk/auth"
coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth" coreauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
// "github.com/tidwall/gjson"
) )
// gitCommitter captures the subset of git-backed token store capabilities used by the watcher. // gitCommitter captures the subset of git-backed token store capabilities used by the watcher.
@@ -59,6 +53,7 @@ type Watcher struct {
pendingOrder []string pendingOrder []string
dispatchCancel context.CancelFunc dispatchCancel context.CancelFunc
gitCommitter gitCommitter gitCommitter gitCommitter
oldConfigYaml []byte
} }
type stableIDGenerator struct { type stableIDGenerator struct {
@@ -174,6 +169,7 @@ func (w *Watcher) SetConfig(cfg *config.Config) {
w.clientsMutex.Lock() w.clientsMutex.Lock()
defer w.clientsMutex.Unlock() defer w.clientsMutex.Unlock()
w.config = cfg w.config = cfg
w.oldConfigYaml, _ = yaml.Marshal(cfg)
} }
// SetAuthUpdateQueue sets the queue used to emit auth updates. // SetAuthUpdateQueue sets the queue used to emit auth updates.
@@ -528,7 +524,9 @@ func (w *Watcher) reloadConfig() bool {
} }
w.clientsMutex.Lock() w.clientsMutex.Lock()
oldConfig := w.config var oldConfig *config.Config
_ = yaml.Unmarshal(w.oldConfigYaml, &oldConfig)
w.oldConfigYaml, _ = yaml.Marshal(newConfig)
w.config = newConfig w.config = newConfig
w.clientsMutex.Unlock() w.clientsMutex.Unlock()
@@ -606,6 +604,12 @@ func (w *Watcher) reloadConfig() bool {
log.Debugf(" %s", change) log.Debugf(" %s", change)
} }
} }
if oldConfig.QuotaExceeded.SwitchProject != newConfig.QuotaExceeded.SwitchProject {
log.Debugf(" quota-exceeded.switch-project: %t -> %t", oldConfig.QuotaExceeded.SwitchProject, newConfig.QuotaExceeded.SwitchProject)
}
if oldConfig.QuotaExceeded.SwitchPreviewModel != newConfig.QuotaExceeded.SwitchPreviewModel {
log.Debugf(" quota-exceeded.switch-preview-model: %t -> %t", oldConfig.QuotaExceeded.SwitchPreviewModel, newConfig.QuotaExceeded.SwitchPreviewModel)
}
} }
authDirChanged := oldConfig == nil || oldConfig.AuthDir != newConfig.AuthDir authDirChanged := oldConfig == nil || oldConfig.AuthDir != newConfig.AuthDir