vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove prefix

release-2.0
Blake Mizerany 2014-09-02 14:01:49 -07:00 committed by Yicheng Qin
parent 9cdb7f073d
commit 24afe8d22b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etcdserver2/etcdhttp/http.go
View File

@ -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
}