gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stop accepted and alive connections (http keep-alive) when the rpc service is stopped

Browse Source
This commit is contained in:
Bas van Kervel
2015-04-16 19:23:57 +02:00
parent 57f93d25bd
commit ead3dd9759
2 changed files with 71 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rpc/http.go
View File

@ -14,7 +14,7 @@ import (
)
var rpclogger = logger.NewLogger("RPC")
var rpclistener *ControllableTCPListener
var rpclistener *StoppableTCPListener
const (
jsonrpcver = "2.0"
@ -22,12 +22,14 @@ const (
)
func Start(pipe *xeth.XEth, config RpcConfig) error {
if rpclistener != nil { // listener already running
glog.Infoln("RPC listener already running")
return fmt.Errorf("RPC already running on %s", rpclistener.Addr().String())
if rpclistener != nil {
if fmt.Sprintf("%s:%d", config.ListenAddress, config.ListenPort) != rpclistener.Addr().String() {
return fmt.Errorf("RPC service already running on %s ", rpclistener.Addr().String())
}
return nil // RPC service already running on given host/port
}
l, err := NewControllableTCPListener(fmt.Sprintf("%s:%d", config.ListenAddress, config.ListenPort))
l, err := NewStoppableTCPListener(fmt.Sprintf("%s:%d", config.ListenAddress, config.ListenPort))
if err != nil {
rpclogger.Errorf("Can't listen on %s:%d: %v", config.ListenAddress, config.ListenPort, err)
return err
@ -41,7 +43,7 @@ func Start(pipe *xeth.XEth, config RpcConfig) error {
opts.AllowedOrigins = []string{config.CorsDomain}
c := cors.New(opts)
handler = c.Handler(JSONRPC(pipe))
handler = NewStoppableHandler(c.Handler(JSONRPC(pipe)), l.stop)
} else {
handler = JSONRPC(pipe)
}
@ -52,13 +54,11 @@ func Start(pipe *xeth.XEth, config RpcConfig) error {
}
func Stop() error {
if rpclistener == nil { // listener not running
glog.Infoln("RPC listener not running")
return nil
if rpclistener != nil {
rpclistener.Stop()
rpclistener = nil
}
rpclistener.Stop()
rpclistener = nil
return nil
}