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

refactor(PeerServer): Use a config struct in PeerServer

Browse Source
This commit is contained in:
Brian Waldon
2014-01-15 23:17:04 -08:00
parent 91f768f9ae
commit 9c8a23c333
6 changed files with 84 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/transporter.go
View File

@@ -27,8 +27,8 @@ type dialer func(network, addr string) (net.Conn, error)
// whether the user give the server cert and key
func newTransporter(scheme string, tlsConf tls.Config, peerServer *PeerServer) *transporter {
// names for each type of timeout, for the sake of clarity
dialTimeout := (3 * peerServer.HeartbeatTimeout) + peerServer.ElectionTimeout
responseHeaderTimeout := (3 * peerServer.HeartbeatTimeout) + peerServer.ElectionTimeout
dialTimeout := (3 * peerServer.Config.HeartbeatTimeout) + peerServer.Config.ElectionTimeout
responseHeaderTimeout := (3 * peerServer.Config.HeartbeatTimeout) + peerServer.Config.ElectionTimeout
t := transporter{}
@@ -227,7 +227,7 @@ func (t *transporter) Get(urlStr string) (*http.Response, *http.Request, error)
// Cancel the on fly HTTP transaction when timeout happens.
func (t *transporter) CancelWhenTimeout(req *http.Request) {
go func() {
time.Sleep(t.peerServer.HeartbeatTimeout)
time.Sleep(t.peerServer.Config.HeartbeatTimeout)
t.transport.CancelRequest(req)
}()
}