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

Merge pull request #1687 from xiang90/fix_listener

Browse Source 
Fix listener
This commit is contained in:
Xiang Li 2014-11-11 13:10:51 -08:00
commit 3f3fc05c8f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etcdmain/etcd.go
View File

@ -222,7 +222,7 @@ func startEtcd() error {
plns := make([]net.Listener, 0)
for _, u := range lpurls {
var l net.Listener
l, err = transport.NewListener(u.Host, peerTLSInfo)
l, err = transport.NewListener(u.Host, u.Scheme, peerTLSInfo)
if err != nil {
return err
}
@ -246,7 +246,7 @@ func startEtcd() error {
clns := make([]net.Listener, 0)
for _, u := range lcurls {
var l net.Listener
l, err = transport.NewListener(u.Host, clientTLSInfo)
l, err = transport.NewListener(u.Host, u.Scheme, clientTLSInfo)
if err != nil {
return err
}
@ -349,7 +349,7 @@ func startProxy() error {
}
// Start a proxy server goroutine for each listen address
for _, u := range lcurls {
l, err := transport.NewListener(u.Host, clientTLSInfo)
l, err := transport.NewListener(u.Host, u.Scheme, clientTLSInfo)
if err != nil {
return err
}

4
pkg/transport/listener.go
View File

@ -27,13 +27,13 @@ import (
"time"
)
func NewListener(addr string, info TLSInfo) (net.Listener, error) {
func NewListener(addr string, scheme string, info TLSInfo) (net.Listener, error) {
l, err := net.Listen("tcp", addr)
if err != nil {
return nil, err
}
if !info.Empty() {
if !info.Empty() && scheme == "https" {
cfg, err := info.ServerConfig()
if err != nil {
return nil, err