Skip to content

Commit

Permalink
HTTPServer implements Lifecycle and can be started by the lifecycle l…
Browse files Browse the repository at this point in the history 
…oop in node (ethereum#17)
  • Loading branch information
@renaynay
renaynay committed Jul 21, 2020
1 parent 6ed4779 commit d7f1bbe
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 126 deletions.
8 changes: 6 additions & 2 deletions node/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,9 @@ func (api *PrivateAdminAPI) StopRPC() (bool, error) {

for _, httpServer := range api.node.httpServers {
if httpServer.RPCAllowed {
api.node.stopServer(httpServer)
if err := httpServer.Stop(); err != nil {
return false, err
}
return true, nil
}
}
Expand Down Expand Up @@ -308,7 +310,9 @@ func (api *PrivateAdminAPI) StopWS() (bool, error) {
httpServer.WSAllowed = false
// if RPC is not enabled on the WS http server, shut it down
if !httpServer.RPCAllowed {
api.node.stopServer(httpServer)
if err := httpServer.Stop(); err != nil {
return false, err
}
}

return true, nil
Expand Down
132 changes: 13 additions & 119 deletions node/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package node

import (
"context"
"errors"
"fmt"
"github.com/ethereum/go-ethereum/cmd/utils"
Expand Down Expand Up @@ -290,6 +289,13 @@ func (n *Node) Start() error {

// TODO running p2p server needs to somehow be added to the backend

// Start the configured RPC interfaces
if err := n.startRPC(); err != nil {
n.stopLifecycles(n.lifecycles)
n.server.Stop()
return err
}

// Start all registered lifecycles
var started []Lifecycle
for _, lifecycle := range n.lifecycles {
Expand All @@ -299,12 +305,6 @@ func (n *Node) Start() error {
started = append(started, lifecycle)
}

// Lastly, start the configured RPC interfaces
if err := n.configureRPC(); err != nil {
n.stopLifecycles(n.lifecycles)
n.server.Stop()
return err
}
// Finish initializing the service context
n.ServiceContext.AccountManager = n.accman
n.ServiceContext.EventMux = n.eventmux
Expand Down Expand Up @@ -369,6 +369,9 @@ func (n *Node) configureRPC() error {
server.handler = server.NewWebsocketUpgradeHandler(server.handler, wsHandler)

n.log.Info("HTTP configured on endpoint ", "endpoint", server.endpoint)
if server.WSAllowed {
n.log.Info("Websocket configured on endpoint ", "endpoint", server.endpoint)
}
}
if server.WSAllowed && server.handler == nil {
server.handler = server.Srv.WebsocketHandler(server.WsOrigins)
Expand All @@ -387,7 +390,9 @@ func (n *Node) configureRPC() error {
return err
}
// start HTTP server
server.Start()
if err := n.RegisterLifecycle(server); err != nil {
return err
}
n.log.Info("HTTP endpoint successfully opened", "url", fmt.Sprintf("http://%v/", server.ListenerAddr))
}
// All API endpoints started successfully
Expand Down Expand Up @@ -445,114 +450,6 @@ func (n *Node) stopIPC() {
}
}

//// startHTTP initializes and starts the HTTP RPC endpoint.
//func (n *Node) startHTTP(endpoint string, modules []string, cors []string, vhosts []string, timeouts rpc.HTTPTimeouts, wsOrigins []string) error {
// // Short circuit if the HTTP endpoint isn't being exposed
// if endpoint == "" {
// return nil
// }
// // register apis and create handler stack
// srv := rpc.NewServer()
// err := RegisterApisFromWhitelist(n.rpcAPIs, modules, srv, false)
// if err != nil {
// return err
// }
// handler := NewHTTPHandlerStack(srv, cors, vhosts)
// // wrap handler in websocket handler only if websocket port is the same as http rpc
// if n.http.Endpoint() == n.ws.Endpoint() {
// handler = n.http.NewWebsocketUpgradeHandler(handler, srv.WebsocketHandler(wsOrigins))
// }
// httpServer, addr, err := StartHTTPEndpoint(endpoint, timeouts, handler)
// if err != nil {
// return err
// }
// n.log.Info("HTTP endpoint opened", "url", fmt.Sprintf("http://%v/", addr),
// "cors", strings.Join(cors, ","),
// "vhosts", strings.Join(vhosts, ","))
// if n.http.Endpoint() == n.ws.Endpoint() {
// n.log.Info("WebSocket endpoint opened", "url", fmt.Sprintf("ws://%v", addr))
// }
// // All listeners booted successfully
// n.http.endpoint = endpoint
// n.http.Server = httpServer
// n.http.ListenerAddr = addr
// n.http.Srv = srv
//
// return nil
//}

// stopServers terminates the given HTTP servers' endpoints
func (n *Node) stopServer(server *HTTPServer) {
if server.Server != nil {
url := fmt.Sprintf("http://%v/", server.ListenerAddr)
// Don't bother imposing a timeout here.
server.Server.Shutdown(context.Background())
n.log.Info("HTTP Endpoint closed", "url", url)
}
if server.Srv != nil {
server.Srv.Stop()
server.Srv = nil
}
}

//// stopHTTP terminates the HTTP RPC endpoint.
//func (n *Node) stopHTTP() {
// for _, server := range n.httpServers {
// if server.RPCAllowed {
// if server.Server != nil {
// url := fmt.Sprintf("http://%v/", server.ListenerAddr)
// // Don't bother imposing a timeout here.
// server.Server.Shutdown(context.Background())
// n.log.Info("HTTP Endpoint closed", "url", url)
// }
// if server.Srv != nil {
// server.Srv.Stop()
// server.Srv = nil
// }
// }
// }
//}

//// startWS initializes and starts the websocket RPC endpoint.
//func (n *Node) startWS(endpoint string, modules []string, wsOrigins []string, exposeAll bool) error {
// // Short circuit if the WS endpoint isn't being exposed
// if endpoint == "" {
// return nil
// }
//
// srv := rpc.NewServer()
// handler := srv.WebsocketHandler(wsOrigins)
// err := RegisterApisFromWhitelist(n.rpcAPIs, modules, srv, exposeAll)
// if err != nil {
// return err
// }
// httpServer, addr, err := startWSEndpoint(endpoint, handler)
// if err != nil {
// return err
// }
// n.log.Info("WebSocket endpoint opened", "url", fmt.Sprintf("ws://%s", addr))
// // All listeners booted successfully
// n.ws.endpoint = endpoint
// n.ws.ListenerAddr = addr
// n.ws.Server = httpServer
// n.ws.Srv = srv
//
// return nil
//}

//// stopWS terminates the websocket RPC endpoint.
//func (n *Node) stopWS() {
// if n.ws.Server != nil {
// url := fmt.Sprintf("http://%v/", n.ws.ListenerAddr)
// // Don't bother imposing a timeout here.
// n.ws.Server.Shutdown(context.Background())
// n.log.Info("HTTP Endpoint closed", "url", url)
// }
// if n.ws.Srv != nil {
// n.ws.Srv.Stop()
// n.ws.Srv = nil
// }
//}

// Stop terminates a running node along with all it's services. In the node was
// not started, an error is returned.
Expand All @@ -566,9 +463,6 @@ func (n *Node) Stop() error {
}

// Terminate the API, services and the p2p server.
for _, httpServer := range n.httpServers {
n.stopServer(httpServer)
}
n.stopIPC()
n.rpcAPIs = nil
failure := &StopError{
Expand Down
13 changes: 8 additions & 5 deletions node/rpcstack.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package node
import (
"compress/gzip"
"context"
"fmt"
"github.com/ethereum/go-ethereum/rpc"
"io"
"io/ioutil"
Expand Down Expand Up @@ -58,22 +59,24 @@ type HTTPServer struct {
}

// TODO document
func (h *HTTPServer) Start() {
func (h *HTTPServer) Start() error {
go h.Server.Serve(h.Listener)
return nil
}

// TODO document
func (h *HTTPServer) Stop() {
func (h *HTTPServer) Stop() error {
if h.Server != nil {
//url := fmt.Sprintf("http://%v/", h.ListenerAddr)
url := fmt.Sprintf("http://%v/", h.ListenerAddr)
// Don't bother imposing a timeout here.
h.Server.Shutdown(context.Background())
//n.log.Info("HTTP Endpoint closed", "url", url) // TODO log wherever this is called instead
log.Info("HTTP Endpoint closed", "url", url)
}
if h.Srv != nil {
h.Srv.Stop()
h.Srv = nil
}

return nil
}

// Handler returns the handler of the HTTPServer
Expand Down

0 comments on commit d7f1bbe

Please sign in to comment.