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

tm-monitor: add Context to RPC handlers (#3792)

Browse Source 
* Fix rpc handle for tm-monitor

Signed-off-by: Karoly Albert Szabo <szabo.karoly.a@gmail.com>

* go imports file

Signed-off-by: Karoly Albert Szabo <szabo.karoly.a@gmail.com>

* go imports file

Signed-off-by: Karoly Albert Szabo <szabo.karoly.a@gmail.com>

* fix RPCUnmonitor too

Signed-off-by: Karoly Albert Szabo <szabo.karoly.a@gmail.com>
This commit is contained in:
Karoly Albert Szabo 2019-07-13 08:09:28 +02:00 committed by Anton Kaliaev
parent 6d96cf4f05
commit 78e634dd5c
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/tm-monitor/rpc.go
View File

@ -5,9 +5,11 @@ import (
"net" "net"
"net/http" "net/http"
rpctypes "github.com/tendermint/tendermint/rpc/lib/types"
"github.com/tendermint/tendermint/libs/log" "github.com/tendermint/tendermint/libs/log"
rpc "github.com/tendermint/tendermint/rpc/lib/server" rpc "github.com/tendermint/tendermint/rpc/lib/server"
monitor "github.com/tendermint/tendermint/tools/tm-monitor/monitor" "github.com/tendermint/tendermint/tools/tm-monitor/monitor"
) )
func startRPC(listenAddr string, m *monitor.Monitor, logger log.Logger) net.Listener { func startRPC(listenAddr string, m *monitor.Monitor, logger log.Logger) net.Listener {
@ -41,33 +43,33 @@ func routes(m *monitor.Monitor) map[string]*rpc.RPCFunc {
} }
// RPCStatus returns common statistics for the network and statistics per node. // RPCStatus returns common statistics for the network and statistics per node.
func RPCStatus(m *monitor.Monitor) interface{} { func RPCStatus(m *monitor.Monitor) func(*rpctypes.Context) (networkAndNodes, error) {
return func() (networkAndNodes, error) { return func(_ *rpctypes.Context) (networkAndNodes, error) {
return networkAndNodes{m.Network, m.Nodes}, nil return networkAndNodes{m.Network, m.Nodes}, nil
} }
} }
// RPCNetworkStatus returns common statistics for the network. // RPCNetworkStatus returns common statistics for the network.
func RPCNetworkStatus(m *monitor.Monitor) interface{} { func RPCNetworkStatus(m *monitor.Monitor) func(*rpctypes.Context) (*monitor.Network, error) {
return func() (*monitor.Network, error) { return func(_ *rpctypes.Context) (*monitor.Network, error) {
return m.Network, nil return m.Network, nil
} }
} }
// RPCNodeStatus returns statistics for the given node. // RPCNodeStatus returns statistics for the given node.
func RPCNodeStatus(m *monitor.Monitor) interface{} { func RPCNodeStatus(m *monitor.Monitor) func(*rpctypes.Context, string) (*monitor.Node, error) {
return func(name string) (*monitor.Node, error) { return func(_ *rpctypes.Context, name string) (*monitor.Node, error) {
if i, n := m.NodeByName(name); i != -1 { if i, n := m.NodeByName(name); i != -1 {
return n, nil return n, nil
} }
return nil, errors.New("Cannot find node with that name") return nil, errors.New("cannot find node with that name")
} }
} }
// RPCMonitor allows to dynamically add a endpoint to under the monitor. Safe // RPCMonitor allows to dynamically add a endpoint to under the monitor. Safe
// to call multiple times. // to call multiple times.
func RPCMonitor(m *monitor.Monitor) interface{} { func RPCMonitor(m *monitor.Monitor) func(*rpctypes.Context, string) (*monitor.Node, error) {
return func(endpoint string) (*monitor.Node, error) { return func(_ *rpctypes.Context, endpoint string) (*monitor.Node, error) {
i, n := m.NodeByName(endpoint) i, n := m.NodeByName(endpoint)
if i == -1 { if i == -1 {
n = monitor.NewNode(endpoint) n = monitor.NewNode(endpoint)
@ -80,13 +82,13 @@ func RPCMonitor(m *monitor.Monitor) interface{} {
} }
// RPCUnmonitor removes the given endpoint from under the monitor. // RPCUnmonitor removes the given endpoint from under the monitor.
func RPCUnmonitor(m *monitor.Monitor) interface{} { func RPCUnmonitor(m *monitor.Monitor) func(*rpctypes.Context, string) (bool, error) {
return func(endpoint string) (bool, error) { return func(_ *rpctypes.Context, endpoint string) (bool, error) {
if i, n := m.NodeByName(endpoint); i != -1 { if i, n := m.NodeByName(endpoint); i != -1 {
m.Unmonitor(n) m.Unmonitor(n)
return true, nil return true, nil
} }
return false, errors.New("Cannot find node with that name") return false, errors.New("cannot find node with that name")
} }
} }