Browse Source

Merge pull request #6016 from endocode/kayrus/fix_serve_err_return

embed: Fixed serve() err return
Anthony Romano 9 years ago
parent
commit
2bf55e3a15
1 changed files with 3 additions and 1 deletions
  1. 3 1
      embed/etcd.go

+ 3 - 1
embed/etcd.go

@@ -127,7 +127,9 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
 	e.errc = make(chan error, len(e.Peers)+len(e.Clients)+2*len(e.sctxs))
 	e.errc = make(chan error, len(e.Peers)+len(e.Clients)+2*len(e.sctxs))
 
 
 	e.Server.Start()
 	e.Server.Start()
-	e.serve()
+	if err = e.serve(); err != nil {
+		return
+	}
 	<-e.Server.ReadyNotify()
 	<-e.Server.ReadyNotify()
 	return
 	return
 }
 }