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

Move setupCluster inside startEtcd

Browse Source
This commit is contained in:
Barak Michener 2014-10-21 18:04:29 -04:00
parent 502a3c2460
commit 52dedab7b4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.go
View File

@ -129,13 +129,8 @@ func main() {
pkg.SetFlagsFromEnv(fs) pkg.SetFlagsFromEnv(fs)
localMember, err := setupCluster()
if err != nil {
log.Fatalf("etcd: setupCluster returned error %v", err)
}
if string(*proxyFlag) == flagtypes.ProxyValueOff { if string(*proxyFlag) == flagtypes.ProxyValueOff {
startEtcd(localMember) startEtcd()
} else { } else {
startProxy() startProxy()
} }
@ -145,7 +140,12 @@ func main() {
} }
// startEtcd launches the etcd server and HTTP handlers for client/server communication. // startEtcd launches the etcd server and HTTP handlers for client/server communication.
func startEtcd(self *etcdserver.Member) { func startEtcd() {
self, err := setupCluster()
if err != nil {
log.Fatalf("etcd: setupCluster returned error %v", err)
}
if *dir == "" { if *dir == "" {
*dir = fmt.Sprintf("%v_etcd_data", *name) *dir = fmt.Sprintf("%v_etcd_data", *name)
log.Printf("etcd: no data-dir provided, using default data-dir ./%s", *dir) log.Printf("etcd: no data-dir provided, using default data-dir ./%s", *dir)