fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-21 00:46:32 +00:00
Code Issues Projects Releases Wiki Activity

[tm-monitor] preserve nodes ordering (Fixes #11)

Browse Source
This commit is contained in:
Anton Kaliaev
2017-03-20 18:27:34 +04:00
parent c8e0eca7e5
commit 4ae36d4e76
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tm-monitor/rpc.go
View File

@ -38,14 +38,7 @@ func routes(m *monitor.Monitor) map[string]*rpc.RPCFunc {
// RPCStatus returns common statistics for the network and statistics per node.
func RPCStatus(m *monitor.Monitor) interface{} {
return func() (networkAndNodes, error) {
values := make([]*monitor.Node, len(m.Nodes))
i := 0
for _, v := range m.Nodes {
values[i] = v
i++
}
return networkAndNodes{m.Network, values}, nil
return networkAndNodes{m.Network, m.Nodes}, nil
}
}
@ -59,19 +52,23 @@ func RPCNetworkStatus(m *monitor.Monitor) interface{} {
// RPCNodeStatus returns statistics for the given node.
func RPCNodeStatus(m *monitor.Monitor) interface{} {
return func(name string) (*monitor.Node, error) {
if n, ok := m.Nodes[name]; ok {
if i, n := m.NodeByName(name); i != -1 {
return n, nil
}
return nil, errors.New("Cannot find node with that name")
}
}
// RPCMonitor allows to dynamically add a endpoint to under the monitor.
// RPCMonitor allows to dynamically add a endpoint to under the monitor. Safe
// to call multiple times.
func RPCMonitor(m *monitor.Monitor) interface{} {
return func(endpoint string) (*monitor.Node, error) {
n := monitor.NewNode(endpoint)
if err := m.Monitor(n); err != nil {
return nil, err
i, n := m.NodeByName(endpoint)
if i == -1 {
n = monitor.NewNode(endpoint)
if err := m.Monitor(n); err != nil {
return nil, err
}
}
return n, nil
}
@ -80,7 +77,7 @@ func RPCMonitor(m *monitor.Monitor) interface{} {
// RPCUnmonitor removes the given endpoint from under the monitor.
func RPCUnmonitor(m *monitor.Monitor) interface{} {
return func(endpoint string) (bool, error) {
if n, ok := m.Nodes[endpoint]; ok {
if i, n := m.NodeByName(endpoint); i != -1 {
m.Unmonitor(n)
return true, nil
}