fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-20 16:36:31 +00:00
Code Issues Projects Releases Wiki Activity

stop rpc listeners in node.OnStop()

Browse Source
This commit is contained in:
Ethan Buchman
2017-03-03 19:28:17 -05:00
parent b13924701e
commit 8192bb0aaf
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
node/node.go
View File

@ -44,6 +44,7 @@ type Node struct {
genesisDoc *types.GenesisDoc genesisDoc *types.GenesisDoc
privKey crypto.PrivKeyEd25519 privKey crypto.PrivKeyEd25519
proxyApp proxy.AppConns proxyApp proxy.AppConns
rpcListeners []net.Listener
} }
func NewNodeDefault(config cfg.Config) *Node { func NewNodeDefault(config cfg.Config) *Node {
@ -208,10 +209,11 @@ func (n *Node) OnStart() error {
// Run the RPC server // Run the RPC server
if n.config.GetString("rpc_laddr") != "" { if n.config.GetString("rpc_laddr") != "" {
_, err := n.startRPC() listeners, err := n.startRPC()
if err != nil { if err != nil {
return err return err
} }
n.rpcListeners = listeners
} }
return nil return nil
@ -230,6 +232,13 @@ func (n *Node) OnStop() {
log.Notice("Stopping Node") log.Notice("Stopping Node")
// TODO: gracefully disconnect from peers. // TODO: gracefully disconnect from peers.
n.sw.Stop() n.sw.Stop()
for _, l := range n.rpcListeners {
log.Info("Closing rpc listener", "listener", l)
if err := l.Close(); err != nil {
log.Error("Error closing listener", "listener", l, "error", err)
}
}
} }
// Add the event switch to reactors, mempool, etc. // Add the event switch to reactors, mempool, etc.

4
test/persist/test_failure_indices.sh
View File

@ -45,8 +45,8 @@ function kill_procs(){
wait "$PID_TENDERMINT" wait "$PID_TENDERMINT"
# wait for the ports to be released # wait for the ports to be released
wait_for_port 46656 #wait_for_port 46656
wait_for_port 46657 #wait_for_port 46657
} }
# wait for port to be available # wait for port to be available