etcdserver: GetClusterFromPeers -> GetClusterFromRemotePeers

2015-02-13 19:05:29 -08:00
parent f7540912d6
commit c5ca1218f3
4 changed files with 8 additions and 10 deletions
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@ -157,8 +157,7 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {

 	switch {
 	case !haveWAL && !cfg.NewCluster:
-		us := getRemotePeerURLs(cfg.Cluster, cfg.Name)
-		existingCluster, err := GetClusterFromPeers(us, cfg.Transport)
+		existingCluster, err := GetClusterFromRemotePeers(getRemotePeerURLs(cfg.Cluster, cfg.Name), cfg.Transport)
 		if err != nil {
 			return nil, fmt.Errorf("cannot fetch cluster info from peer urls: %v", err)
 		}