mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fix ApplyConfig() error handling

Browse source 
Currently, Prometheus starts up without any error when there is an
invalid rule file :-/
This commit is contained in:
Julius Volz 2016-08-12 03:23:18 +02:00
parent be596f82b4
commit 4a866c13be
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) 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 { for _, rl := range rls {
if err != nil { if err := rl.ApplyConfig(conf); err != nil {
err = rl.ApplyConfig(conf) log.Error("Failed to apply configuration: ", err)
} else { failed = true
rl.ApplyConfig(conf)
} }
} }
return err if failed {
return fmt.Errorf("one or more errors occured while applying the new configuration (-config.file=%s)", filename)
}
return nil
} }