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: fix nil dereference on error to set up initial cluster

Browse Source
This commit is contained in:
Anthony Romano 2016-07-15 14:34:06 -07:00
parent 1ba7bb237f
commit 34602b87ec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embed/etcd.go
View File

@ -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)
} }
} }