This commit is contained in:
Ivan7702
2013-09-02 19:58:45 -04:00
parent 8eaa9500e9
commit 90d7ebec47
3 changed files with 10 additions and 10 deletions

View File

@@ -31,7 +31,7 @@ func newRaftServer(name string, url string, listenHost string, tlsConf *TLSConfi
// Create transporter for raft
raftTransporter := newTransporter(tlsConf.Scheme, tlsConf.Client, ElectionTimeout)
// Create raft server
server, err := raft.NewServer(name, dirPath, raftTransporter, etcdStore, nil)
@@ -198,7 +198,7 @@ func joinCluster(cluster []string) bool {
if _, ok := err.(etcdErr.Error); ok {
fatal(err)
}
debugf("cannot join to cluster via machine %s %s", machine, err)
}
}

View File

@@ -21,7 +21,7 @@ type transporter struct {
// response struct
type transporterResponse struct {
resp *http.Response
err error
err error
}
// Create transporter using by raft server
@@ -162,11 +162,11 @@ func (t *transporter) SendSnapshotRecoveryRequest(server *raft.Server, peer *raf
func (t *transporter) Post(path string, body io.Reader) (*http.Response, error) {
c := make(chan *transporterResponse, 1)
go func() {
tr := new(transporterResponse)
tr.resp, tr.err = t.client.Post(path, "application/json", body)
c <-tr
c <- tr
}()
return t.waitResponse(c)
@@ -177,11 +177,11 @@ func (t *transporter) Post(path string, body io.Reader) (*http.Response, error)
func (t *transporter) Get(path string) (*http.Response, error) {
c := make(chan *transporterResponse, 1)
go func() {
tr := new(transporterResponse)
tr.resp, tr.err = t.client.Get(path)
c <-tr
c <- tr
}()
return t.waitResponse(c)
@@ -195,10 +195,10 @@ func (t *transporter) waitResponse(responseChan chan *transporterResponse) (*htt
case <-timeoutChan:
return nil, fmt.Errorf("Wait Response Timeout: %v", t.timeout)
case r:= <-responseChan:
case r := <-responseChan:
return r.resp, r.err
}
// for complier
return nil, nil
}
}

View File

@@ -15,7 +15,7 @@ func TestTransporterTimeout(t *testing.T) {
ts.Get("http://google.com")
_, err := ts.Get("http://google.com:9999") // it doesn't exisit
if err == nil || err.Error() != "Wait Response Timeout: 1s" {
t.Fatal("timeout error: ", err.Error( ))
t.Fatal("timeout error: ", err.Error())
}
_, err = ts.Post("http://google.com:9999", nil) // it doesn't exisit