mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-11 13:57:36 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #1890 from prometheus/fix-applyconfig-error

Browse source 
Fix ApplyConfig() error handling
This commit is contained in:
Tobias Schmidt 2016-08-13 18:55:35 -04:00 committed by GitHub
parent 80b0e1b74c 4a866c13be
commit 289e299eb5
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmd/prometheus/main.go
View file

@ -227,13 +227,15 @@ func reloadConfig(filename string, rls ...Reloadable) (err error) {
return fmt.Errorf("couldn't load configuration (-config.file=%s): %v", filename, err)
}
// Apply all configs and return the first error if there were any.
failed := false
for _, rl := range rls {
if err != nil {
err = rl.ApplyConfig(conf)
} else {
rl.ApplyConfig(conf)
if err := rl.ApplyConfig(conf); err != nil {
log.Error("Failed to apply configuration: ", err)
failed = true
}
}
return err
if failed {
return fmt.Errorf("one or more errors occured while applying the new configuration (-config.file=%s)", filename)
}
return nil
}