From 2364d71ea2d62b11cf4cc514c14823dfb2d8a4e1 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Mon, 21 Mar 2016 21:55:06 -0700 Subject: [PATCH] etcdmain: fix shadowed variables --- etcdmain/etcd.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go index 69138b680..0343df0cb 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go @@ -257,7 +257,8 @@ func startEtcd(cfg *config) (<-chan struct{}, error) { return nil, err } - if fdLimit, err := runtimeutil.FDLimit(); err == nil { + var fdLimit uint64 + if fdLimit, err = runtimeutil.FDLimit(); err == nil { if fdLimit <= reservedInternalFDNum { plog.Fatalf("file descriptor limit[%d] of etcd process is too low, and should be set higher than %d to ensure internal usage", fdLimit, reservedInternalFDNum) } @@ -394,13 +395,15 @@ func startProxy(cfg *config) error { peerURLs = urls.PeerURLs plog.Infof("proxy: using peer urls %v from cluster file %q", peerURLs, clusterfile) case os.IsNotExist(err): - urlsmap, _, err := getPeerURLsMapAndToken(cfg, "proxy") + var urlsmap types.URLsMap + urlsmap, _, err = getPeerURLsMapAndToken(cfg, "proxy") if err != nil { return fmt.Errorf("error setting up initial cluster: %v", err) } if cfg.durl != "" { - s, err := discovery.GetCluster(cfg.durl, cfg.dproxy) + var s string + s, err = discovery.GetCluster(cfg.durl, cfg.dproxy) if err != nil { return err }