Add full path for error messages on containers.conf #164
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
|
@FlorianLudwig @mheon PTAL |
|
LGTM |
FlorianLudwig
suggested changes
May 26, 2020
pkg/config/libpodConfig.go
Outdated
| @@ -226,7 +226,7 @@ func newLibpodConfig(c *Config) error { | |||
|
|
|||
| // hard code EventsLogger to "file" to match older podman versions. | |||
| if config.EventsLogger != "file" { | |||
| logrus.Debugf("Ignoring lipod.conf EventsLogger setting %q. Use containers.conf if you want to change this setting and remove libpod.conf files.", config.EventsLogger) | |||
| logrus.Debugf("Ignoring lipod.conf EventsLogger setting %q. Use %q if you want to change this setting and remove libpod.conf files.", Path(), config.EventsLogger) | |||
There was a problem hiding this comment.
lipod.conf should be libpod.conf
| @@ -262,7 +262,7 @@ func systemLibpodConfigs() ([]string, error) { | |||
| } | |||
| // TODO: Raise to Warnf, when Podman is updated to | |||
| // remove libpod.conf by default | |||
| logrus.Debugf("Found deprecated file %s, please remove. Use %s to override defaults.\n", path, containersConfPath) | |||
| logrus.Debugf("Found deprecated file %s, please remove. Use %s to override defaults.\n", Path(), containersConfPath) | |||
There was a problem hiding this comment.
It seems the function Path is only used for logging but not the code path actually loading the configs, which might lead to a different path being logged and loaded.
There was a problem hiding this comment.
Well yes, but the code that does the actual search is also going to use /usr/share/containers/containers.conf for reading the distro configuration. But we don't want to indicate to users that they should use that configuration.
Also add new function to allow container engines to tell users where to edit containers.conf file. Signed-off-by: Daniel J Walsh <[email protected]>
|
LGTM |
|
LGTM |
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.
Also add new function to allow container engines to tell users
where to edit containers.conf file.
Signed-off-by: Daniel J Walsh [email protected]