mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump(github.com/coreos/go-etcd): 460022c1238ee0913013936e3486f41a3c7c1d7a

Browse Source
This commit is contained in:
Brandon Philips
2013-08-18 19:43:14 -07:00
parent 449cad4658
commit 13afdb0825
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
third_party/github.com/coreos/go-etcd/etcd/client.go vendored
View File

@ -123,12 +123,19 @@ func (c *Client) internalSyncCluster(machines []string) bool {
continue continue
} else { } else {
b, err := ioutil.ReadAll(resp.Body) b, err := ioutil.ReadAll(resp.Body)
resp.Body.Close()
if err != nil { if err != nil {
// try another machine in the cluster // try another machine in the cluster
continue continue
} }
// update Machines List // update Machines List
c.cluster.Machines = strings.Split(string(b), ",") c.cluster.Machines = strings.Split(string(b), ",")
// update leader
// the first one in the machine list is the leader
logger.Debugf("update.leader[%s,%s]", c.cluster.Leader, c.cluster.Machines[0])
c.cluster.Leader = c.cluster.Machines[0]
logger.Debug("sync.machines ", c.cluster.Machines) logger.Debug("sync.machines ", c.cluster.Machines)
return true return true
} }
@ -139,6 +146,7 @@ func (c *Client) internalSyncCluster(machines []string) bool {
// serverName should contain both hostName and port // serverName should contain both hostName and port
func (c *Client) createHttpPath(serverName string, _path string) string { func (c *Client) createHttpPath(serverName string, _path string) string {
httpPath := path.Join(serverName, _path) httpPath := path.Join(serverName, _path)
httpPath = c.config.Scheme + "://" + httpPath
return httpPath return httpPath
} }