Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

etcdmain: fix ignoring of ETCD_CONFIG_FILE env variable #10762

Merged
merged 2 commits into from
Jun 8, 2019
Merged

etcdmain: fix ignoring of ETCD_CONFIG_FILE env variable #10762

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6955331
etcdmain: fix ignoring of ETCD_CONFIG_FILE env variable
May 25, 2019
14c5eaa
etcdmain: improve readability
May 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions etcdmain/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,14 @@ func (cfg *config) parse(arguments []string) error {
}

var err error

AstolfoKawaii marked this conversation as resolved.
Show resolved Hide resolved
// This env variable must be parsed separately
// because we need to determine whether to use or
// ignore the env variables based on if the config file is set.
if cfg.configFile == "" {
cfg.configFile = os.Getenv(flags.FlagToEnv("ETCD", "config-file"))
}

if cfg.configFile != "" {
err = cfg.configFromFile(cfg.configFile)
if lg := cfg.ec.GetLogger(); lg != nil {
Expand Down