Merge pull request #5954 from heyitsanthony/fix-embed-cfg-validate
embed: fix nil dereference on error to set up initial clusterrelease-3.1
commit
4835322aa1
|
@ -66,7 +66,7 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
|
||||||
e = &Etcd{cfg: *inCfg}
|
e = &Etcd{cfg: *inCfg}
|
||||||
cfg := &e.cfg
|
cfg := &e.cfg
|
||||||
defer func() {
|
defer func() {
|
||||||
if err != nil {
|
if e != nil && err != nil {
|
||||||
e.Close()
|
e.Close()
|
||||||
e = nil
|
e = nil
|
||||||
}
|
}
|
||||||
|
@ -90,7 +90,7 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
|
||||||
if !isMemberInitialized(cfg) {
|
if !isMemberInitialized(cfg) {
|
||||||
urlsmap, token, err = cfg.PeerURLsMapAndToken("etcd")
|
urlsmap, token, err = cfg.PeerURLsMapAndToken("etcd")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("error setting up initial cluster: %v", err)
|
return e, fmt.Errorf("error setting up initial cluster: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue