Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

embed: load config defaults before loading config from file

Browse Source
This commit is contained in:
Anthony Romano 2016-08-10 09:44:50 -07:00
parent 06e2338108
commit 6de993b468
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embed/config.go
View File

@ -160,7 +160,7 @@ func NewConfig() *Config {
} }
func ConfigFromFile(path string) (*Config, error) { func ConfigFromFile(path string) (*Config, error) {
cfg := &configYAML{} cfg := &configYAML{Config: *NewConfig()}
if err := cfg.configFromFile(path); err != nil { if err := cfg.configFromFile(path); err != nil {
return nil, err return nil, err
} }