etcdmain: actually return errors

release-2.0
Jonathan Boulle 2014-11-10 11:59:59 -08:00
parent 2dcd8213e4
commit 8799679083
1 changed files with 4 additions and 4 deletions

View File

@ -190,18 +190,18 @@ func Main() {
func startEtcd() error {
cls, err := setupCluster()
if err != nil {
fmt.Errorf("error setting up initial cluster: %v", err)
return fmt.Errorf("error setting up initial cluster: %v", err)
}
if *dir == "" {
*dir = fmt.Sprintf("%v.etcd", *name)
fmt.Errorf("no data-dir provided, using default data-dir ./%s", *dir)
return fmt.Errorf("no data-dir provided, using default data-dir ./%s", *dir)
}
if err := os.MkdirAll(*dir, privateDirMode); err != nil {
fmt.Errorf("cannot create data directory: %v", err)
return fmt.Errorf("cannot create data directory: %v", err)
}
if err := fileutil.IsDirWriteable(*dir); err != nil {
fmt.Errorf("cannot write to data directory: %v", err)
return fmt.Errorf("cannot write to data directory: %v", err)
}
pt, err := transport.NewTransport(peerTLSInfo)