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

Merge pull request #1680 from jonboulle/fix_errors

Browse Source 
etcdmain: actually return errors
This commit is contained in:
Jonathan Boulle
2014-11-10 12:04:05 -08:00
parent 2dcd8213e4 8799679083
commit 99aa2caa3d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
etcdmain/etcd.go
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)