Report faulting file when config reload fails #11304
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ph
suggested changes
Mar 20, 2019
libbeat/cfgfile/reload.go
Outdated
| @@ -35,6 +35,7 @@ import ( | |||
| ) | |||
|
|
|||
| var ( | |||
| // DefaultDynamicConfig provides default behavior for a Runner | |||
There was a problem hiding this comment.
Thanks for cleaning up the godoc, can you add a dot after "Runner"?
libbeat/cfgfile/reload.go
Outdated
| @@ -220,7 +225,7 @@ func (rl *Reloader) loadConfigs(files []string) ([]*reload.ConfigWithMeta, error | |||
| configs, err := LoadList(file) | |||
| if err != nil { | |||
| errs = append(errs, err) | |||
| logp.Err("Error loading config: %s", err) | |||
| logp.Err("Error loading config from '%s': %v", file, err) | |||
There was a problem hiding this comment.
I would probably make a clear separation between the file and the error.
Error loading config from file '%s', error %v"
ruflin
approved these changes
Mar 21, 2019
ph
approved these changes
Mar 22, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Modifying error output when reload config fails from
to
Fixes #8122