From 0e1125666f9da15cd97b9edc4e148f949a57def8 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Sun, 11 Aug 2013 00:42:46 -0700 Subject: [PATCH] better naming in join --- etcd.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etcd.go b/etcd.go index 55faf5e24..9367def86 100644 --- a/etcd.go +++ b/etcd.go @@ -572,7 +572,7 @@ func newCertPool(CAFile string) (tls.ClientAuthType, *x509.CertPool) { } // Send join requests to the leader. -func joinCluster(s *raft.Server, serverName string) error { +func joinCluster(s *raft.Server, raftURL string) error { var b bytes.Buffer command := &JoinCommand{ @@ -590,9 +590,10 @@ func joinCluster(s *raft.Server, serverName string) error { panic("wrong type") } - debugf("Send Join Request to %s", serverName) + joinURL := url.URL{Host: raftURL, Scheme: raftTransporter.scheme, Path: "/join"} - joinURL := url.URL{Host: serverName, Scheme: raftTransporter.scheme, Path: "/join"} + debugf("Send Join Request to %s", raftURL) + resp, err := t.Post(joinURL.String(), &b) for {