Skip to content

on failed validation re-evaluate only after an update #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 9, 2025
Merged

on failed validation re-evaluate only after an update #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ func loadConfig(path string, lastModTime time.Time, onChange func(*mirror.RepoPo
newConfig, err := parseConfigFile(path)
if err != nil {
logger.Error("failed to reload config", "err", err)
return lastModTime, false
// update modTime to re-evaluate after an update
return modTime, false
}
return modTime, onChange(newConfig)
}
Expand Down Expand Up @@ -180,18 +181,18 @@ func applyGitDefaults(mirrorConf *mirror.RepoPoolConfig) {
func parseConfigFile(path string) (*mirror.RepoPoolConfig, error) {
yamlFile, err := os.ReadFile(path)
if err != nil {
return nil, err
return nil, fmt.Errorf("unable to read file err:%w", err)
}

err = validateConfigYaml([]byte(yamlFile))
err = validateConfigYaml(yamlFile)
if err != nil {
return nil, err
return nil, fmt.Errorf("invalid config err:%w", err)
}

conf := &mirror.RepoPoolConfig{}
err = yaml.Unmarshal(yamlFile, conf)
if err != nil {
return nil, err
return nil, fmt.Errorf("unable to decode config err:%w", err)
}

return conf, nil
Expand All @@ -200,7 +201,7 @@ func parseConfigFile(path string) (*mirror.RepoPoolConfig, error) {
func validateConfigYaml(yamlData []byte) error {
var raw map[string]interface{}
if err := yaml.Unmarshal(yamlData, &raw); err != nil {
return err
return fmt.Errorf("unable to decode config err:%w", err)
}

// check all root config sections for unexpected keys
Expand Down
Loading