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(Dockerfile): reverted unneeded changes

Browse Source 
fix(server/config.go): ensured params are changeable from config file and env
fix(server/server.go): removed unnecessary debug line
fix(server/timeout.go): removed a commented block
style(server/transporter.go): put explicit vars to replace timeout expressions
style(tests/server_utils.go): ran gofmt to clean up indenting
This commit is contained in:
Neil Dunbar
2013-12-05 09:23:23 +00:00
parent faab194247
commit 0867b33de5
6 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/transporter.go
View File

@@ -27,13 +27,17 @@ type dialer func(network, addr string) (net.Conn, error)
// Create http or https transporter based on
// 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 := time.Duration(3 * peerServer.heartbeatTimeout + peerServer.electionTimeout) * time.Millisecond
responseHeaderTimeout := time.Duration(3 * peerServer.heartbeatTimeout + peerServer.electionTimeout) * time.Millisecond
t := transporter{}
t.tranTimeout = time.Duration(peerServer.heartbeatTimeout) * time.Millisecond
tr := &http.Transport{
Dial: dialWithTimeoutFactory( time.Duration(3 * peerServer.heartbeatTimeout + peerServer.electionTimeout) * time.Millisecond),
ResponseHeaderTimeout: time.Duration(3 * peerServer.heartbeatTimeout + peerServer.electionTimeout) * time.Millisecond,
Dial: dialWithTimeoutFactory(dialTimeout),
ResponseHeaderTimeout: responseHeaderTimeout,
}
if scheme == "https" {