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

fix test

Browse Source
This commit is contained in:
Xiang Li 2013-08-17 21:21:18 -07:00
parent 5357fb431e
commit 1527b7008c
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etcd_handlers.go
View File

@ -31,7 +31,6 @@ type errorHandler func(http.ResponseWriter, *http.Request) error
func (fn errorHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if e := fn(w, r); e != nil {
fmt.Println(e)
if etcdErr, ok := e.(etcdErr.Error); ok {
debug("Return error: ", etcdErr.Error())
etcdErr.Write(w)

2
test/test.go
View File

@ -176,7 +176,7 @@ func Monitor(size int, allowDeadNum int, leaderChan chan string, all chan bool,
func getLeader(addr string) (string, error) {
resp, err := client.Get(addr + "/leader")
resp, err := client.Get(addr + "/v1/leader")
if err != nil {
return "", err

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

@ -116,7 +116,7 @@ func (c *Client) SyncCluster() bool {
// sync cluster information by providing machine list
func (c *Client) internalSyncCluster(machines []string) bool {
for _, machine := range machines {
httpPath := c.createHttpPath(machine, "machines")
httpPath := c.createHttpPath(machine, "v1/machines")
resp, err := c.httpClient.Get(httpPath)
if err != nil {
// try another machine in the cluster