Skip to content

Commit

Permalink
Remove json config overriding with env vars
Browse files Browse the repository at this point in the history
for restapi and cluster Config

License: MIT
Signed-off-by: Robert Ignat <robert.ignat91@gmail.com>
  • Loading branch information
roignpar committed Feb 8, 2019
1 parent 032f028 commit 9fe3358
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
6 changes: 0 additions & 6 deletions api/rest/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,6 @@ func (cfg *Config) LoadJSON(raw []byte) error {

cfg.Default()

// override json config with env var
err = envconfig.Process(envConfigKey, jcfg)
if err != nil {
return err
}

return cfg.applyJSONConfig(jcfg)
}

Expand Down
6 changes: 0 additions & 6 deletions cluster_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,6 @@ for more information.`)
return errors.New("cluster.Peers and cluster.Bootstrap keys have been deprecated")
}

// override json config with env var
err = envconfig.Process(cfg.ConfigKey(), jcfg)
if err != nil {
return err
}

return cfg.applyConfigJSON(jcfg)
}

Expand Down

0 comments on commit 9fe3358

Please sign in to comment.