status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

agent: Fixing setup of SCADA HTTP listener

This commit is contained in:
Armon Dadgar 2015-02-05 17:54:22 -08:00
parent 6a640604dd
commit b9cdb94f19
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
command/agent/http.go
View File

@ -33,14 +33,10 @@ type HTTPServer struct {
// NewHTTPServers starts new HTTP servers to provide an interface to // NewHTTPServers starts new HTTP servers to provide an interface to
// the agent. // the agent.
func NewHTTPServers(agent *Agent, config *Config, scada net.Listener, logOutput io.Writer) ([]*HTTPServer, error) { func NewHTTPServers(agent *Agent, config *Config, scada net.Listener, logOutput io.Writer) ([]*HTTPServer, error) {
var tlsConfig *tls.Config
var list net.Listener
var httpAddr net.Addr
var err error
var servers []*HTTPServer var servers []*HTTPServer
if config.Ports.HTTPS > 0 { if config.Ports.HTTPS > 0 {
httpAddr, err = config.ClientListener(config.Addresses.HTTPS, config.Ports.HTTPS) httpAddr, err := config.ClientListener(config.Addresses.HTTPS, config.Ports.HTTPS)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -54,7 +50,7 @@ func NewHTTPServers(agent *Agent, config *Config, scada net.Listener, logOutput
NodeName: config.NodeName, NodeName: config.NodeName,
ServerName: config.ServerName} ServerName: config.ServerName}
tlsConfig, err = tlsConf.IncomingTLSConfig() tlsConfig, err := tlsConf.IncomingTLSConfig()
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -64,7 +60,7 @@ func NewHTTPServers(agent *Agent, config *Config, scada net.Listener, logOutput
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)
} }
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()
@ -86,7 +82,7 @@ func NewHTTPServers(agent *Agent, config *Config, scada net.Listener, logOutput
} }
if config.Ports.HTTP > 0 { if config.Ports.HTTP > 0 {
httpAddr, err = config.ClientListener(config.Addresses.HTTP, config.Ports.HTTP) httpAddr, err := config.ClientListener(config.Addresses.HTTP, config.Ports.HTTP)
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to get ClientListener address:port: %v", err) return nil, fmt.Errorf("Failed to get ClientListener address:port: %v", err)
} }
@ -107,6 +103,7 @@ func NewHTTPServers(agent *Agent, config *Config, scada net.Listener, logOutput
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)
} }
var list net.Listener
if isSocket { if isSocket {
// Set up ownership/permission bits on the socket file // 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 {
@ -152,7 +149,7 @@ func NewHTTPServers(agent *Agent, config *Config, scada net.Listener, logOutput
srv.registerHandlers(false) // Never allow debug for SCADA srv.registerHandlers(false) // Never allow debug for SCADA
// Start the server // Start the server
go http.Serve(list, mux) go http.Serve(scada, mux)
servers = append(servers, srv) servers = append(servers, srv)
} }

2
command/agent/scada.go
View File

@ -120,6 +120,8 @@ func (s *scadaListener) Push(conn net.Conn) error {
select { select {
case s.pending <- conn: case s.pending <- conn:
return nil return nil
case <-time.After(time.Second):
return fmt.Errorf("accept timed out")
case <-s.closedCh: case <-s.closedCh:
return fmt.Errorf("scada listener closed") return fmt.Errorf("scada listener closed")
} }