From 8799679083921aecfbde58acc11f96e59c9d472c Mon Sep 17 00:00:00 2001 From: Jonathan Boulle Date: Mon, 10 Nov 2014 11:59:59 -0800 Subject: [PATCH] etcdmain: actually return errors --- etcdmain/etcd.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index 01b17f851..eacba10bb 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -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)