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

feat(config): Gracefully handle empty or invalid optional config

Browse Source
This commit is contained in:
hkfires
2025-10-11 20:49:15 +08:00
parent c3f88126e6
commit fc6aa8ef77
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/config/config.go
View File

@@ -158,6 +158,7 @@ func LoadConfig(configFile string) (*Config, error) {
// LoadConfigOptional reads YAML from configFile. // LoadConfigOptional reads YAML from configFile.
// If optional is true and the file is missing, it returns an empty Config. // If optional is true and the file is missing, it returns an empty Config.
// If optional is true and the file is empty or invalid, it returns an empty Config.
func LoadConfigOptional(configFile string, optional bool) (*Config, error) { func LoadConfigOptional(configFile string, optional bool) (*Config, error) {
// Read the entire configuration file into memory. // Read the entire configuration file into memory.
data, err := os.ReadFile(configFile) data, err := os.ReadFile(configFile)
@@ -171,12 +172,21 @@ func LoadConfigOptional(configFile string, optional bool) (*Config, error) {
return nil, fmt.Errorf("failed to read config file: %w", err) return nil, fmt.Errorf("failed to read config file: %w", err)
} }
// In cloud deploy mode (optional=true), if file is empty or contains only whitespace, return empty config.
if optional && len(data) == 0 {
return &Config{}, nil
}
// Unmarshal the YAML data into the Config struct. // Unmarshal the YAML data into the Config struct.
var cfg Config var cfg Config
// Set defaults before unmarshal so that absent keys keep defaults. // Set defaults before unmarshal so that absent keys keep defaults.
cfg.LoggingToFile = true cfg.LoggingToFile = true
cfg.UsageStatisticsEnabled = true cfg.UsageStatisticsEnabled = true
if err = yaml.Unmarshal(data, &cfg); err != nil { if err = yaml.Unmarshal(data, &cfg); err != nil {
if optional {
// In cloud deploy mode, if YAML parsing fails, return empty config instead of error.
return &Config{}, nil
}
return nil, fmt.Errorf("failed to parse config file: %w", err) return nil, fmt.Errorf("failed to parse config file: %w", err)
} }