luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

agent/http: clean up socket setup

This commit is contained in:
Ryan Uber 2015-01-23 17:57:04 -08:00
parent adb3bd4c5e
commit 068c4137cb
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
command/agent/http.go
View File

@ -64,11 +64,7 @@ func NewHTTPServers(agent *Agent, config *Config, logOutput io.Writer) ([]*HTTPS
return nil, fmt.Errorf("Failed to get Listen on %s: %v", httpAddr.String(), err) return nil, fmt.Errorf("Failed to get Listen on %s: %v", httpAddr.String(), err)
} }
if _, ok := unixSocketAddr(config.Addresses.HTTPS); ok {
list = tls.NewListener(ln, tlsConfig)
} else {
list = tls.NewListener(tcpKeepAliveListener{ln.(*net.TCPListener)}, tlsConfig) list = tls.NewListener(tcpKeepAliveListener{ln.(*net.TCPListener)}, tlsConfig)
}
// Create the mux // Create the mux
mux := http.NewServeMux() mux := http.NewServeMux()
@ -111,17 +107,14 @@ func NewHTTPServers(agent *Agent, config *Config, logOutput io.Writer) ([]*HTTPS
return nil, fmt.Errorf("Failed to get Listen on %s: %v", httpAddr.String(), err) return nil, fmt.Errorf("Failed to get Listen on %s: %v", httpAddr.String(), err)
} }
if _, ok := unixSocketAddr(config.Addresses.HTTP); ok {
list = ln
} else {
list = tcpKeepAliveListener{ln.(*net.TCPListener)}
}
// Set up ownership/permission bits on the socket file
if isSocket { if isSocket {
// Set up ownership/permission bits on the socket file
if err := setFilePermissions(socketPath, config.UnixSockets); err != nil { if err := setFilePermissions(socketPath, config.UnixSockets); err != nil {
return nil, fmt.Errorf("Failed setting up HTTP socket: %s", err) return nil, fmt.Errorf("Failed setting up HTTP socket: %s", err)
} }
list = ln
} else {
list = tcpKeepAliveListener{ln.(*net.TCPListener)}
} }
// Create the mux // Create the mux