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

transport: build TLS config in NewTransport

Browse Source
This commit is contained in:
Brian Waldon 2014-09-23 08:58:21 -07:00
parent e880dd41f2
commit 342ea18239
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.go
View File

@ -151,7 +151,7 @@ func startEtcd() {
n = raft.RestartNode(id, peers.IDs(), 10, 1, snapshot, st, ents)
}
pt, err := transport.NewTransport()
pt, err := transport.NewTransport(transport.TLSInfo{})
if err != nil {
log.Fatal(err)
}

11
transport/listener.go
View File

@ -29,7 +29,7 @@ func NewListener(addr string, info TLSInfo) (net.Listener, error) {
return l, nil
}
func NewTransport() (*http.Transport, error) {
func NewTransport(info TLSInfo) (*http.Transport, error) {
t := &http.Transport{
// timeouts taken from http.DefaultTransport
Dial: (&net.Dialer{
@ -38,6 +38,15 @@ func NewTransport() (*http.Transport, error) {
}).Dial,
TLSHandshakeTimeout: 10 * time.Second,
}
if !info.Empty() {
tlsCfg, err := info.ClientConfig()
if err != nil {
return nil, err
}
t.TLSClientConfig = tlsCfg
}
return t, nil
}