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

Jump to bottom

cmd: fix config file from env variable issue in subcommands #4344

Merged
merged 2 commits into from
Dec 6, 2019
Merged

cmd: fix config file from env variable issue in subcommands #4344

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06425d5
cmd: fix config file from env variable issue in subcommands
fristonio Dec 3, 2019
f15752e
cmd: fix grammar issue in docs
fristonio Dec 4, 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
11 changes: 7 additions & 4 deletions dgraph/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,14 @@ func initCmds() {
x.CheckfNoTrace(os.Chdir(cwd))
}

cfg := rootConf.GetString("config")
if cfg == "" {
return
}
for _, sc := range subcommands {
// Set config file is provided for each subcommand, this is done
// for individual subcommand because each subcommand has its own config
// prefix, like `dgraph zero` expects the prefix to be `DGRAPH_ZERO`.
cfg := sc.Conf.GetString("config")
if cfg == "" {
continue
}
sc.Conf.SetConfigFile(cfg)
x.Check(errors.Wrapf(sc.Conf.ReadInConfig(), "reading config"))
setGlogFlags(sc.Conf)
Expand Down