Look for the config files relative to the path.config flag #2245
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
|
@urso, you should probably review this one. |
tsg
force-pushed
the
fix_cfgfile_default
branch
3 times, most recently
from
a4d8136 to
f71a4cb
Compare
tsg
force-pushed
the
fix_cfgfile_default
branch
from
f71a4cb to
b869144
Compare
| @@ -14,7 +14,7 @@ var ( | |||
| // The default config cannot include the beat name as it is not initialized | |||
| // when this variable is created. See ChangeDefaultCfgfileFlag which should | |||
| // be called prior to flags.Parse(). | |||
| configfiles = flagArgList("c", "beat.yml", "Configuration file `path`") | |||
| configfiles = flagArgList("c", "beat.yml", "Configuration file, relative to path.config") | |||
There was a problem hiding this comment.
An absolute path also works, correct?
|
LGTM. @urso Do you also want to have a look? |
|
LGTM @tsg requires rebase. |
This is a proposal fix for elastic#2171. There's a bit of a chicken and egg problem here, since defining the paths requires the configuration file and the other way around. The implemented logic is to: * if the `-path.config` flag is used, look for the config file relative to it * if not, but `-path.home` flag is used, look for the config file relative to the home path * else, look into the binary location, mostly for backwards compatibility I'm not sure we need the last point, we could leave it relative to the cwd, like most tools would do it. But this requires a BWC break.
tsg
force-pushed
the
fix_cfgfile_default
branch
from
b869144 to
a4afb65
Compare
|
@urso rebased. |
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.
This is a proposal fix for #2171. There's a bit of a chicken and egg
problem here, since defining the paths requires the configuration file
and the other way around. The implemented logic is to:
-path.configflag is used, look for the config file relative toit
-path.homeflag is used, look for the config file relativeto the home path
The last point is a BWC break, because in 1.x the configuration file was relative to the binary location.