From 24afe8d22baac21ba452855df35f6f24df57fe7c Mon Sep 17 00:00:00 2001 From: Blake Mizerany Date: Tue, 2 Sep 2014 14:01:49 -0700 Subject: [PATCH] remove prefix --- etcdserver2/etcdhttp/http.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/etcdserver2/etcdhttp/http.go b/etcdserver2/etcdhttp/http.go index 8516af00d..d05474a8d 100644 --- a/etcdserver2/etcdhttp/http.go +++ b/etcdserver2/etcdhttp/http.go @@ -28,14 +28,14 @@ type Peers map[int64][]string func (ps Peers) Pick(id int64) string { addrs := ps[id] - return fmt.Sprintf("http://%s/raft", addrs[rand.Intn(len(addrs))]) + return fmt.Sprintf("http://%s", addrs[rand.Intn(len(addrs))]) } var errClosed = errors.New("etcdhttp: client closed connection") const DefaultTimeout = 500 * time.Millisecond -func Sender(prefix string, p Peers) func(msgs []raftpb.Message) { +func Sender(p Peers) func(msgs []raftpb.Message) { return func(msgs []raftpb.Message) { for _, m := range msgs { // TODO: create workers that deal with message sending @@ -47,7 +47,13 @@ func Sender(prefix string, p Peers) func(msgs []raftpb.Message) { // don't think his should ever happen, need to // look into this further. elog.TODO() + break } + + url += "/raft" + + log.Println("etcdserver: sending to %d@%s", m.To, url) + // TODO: don't block. we should be able to have 1000s // of messages out at a time. data, err := m.Marshal() @@ -55,7 +61,7 @@ func Sender(prefix string, p Peers) func(msgs []raftpb.Message) { elog.TODO() break // drop bad message } - if httpPost(url+prefix, data) { + if httpPost(url, data) { break // success }