Merge pull request #1611 from michaeljfazio/peer-stats

Added p2p stats to node stat output

Author: vincenthz

jormungandr/src/network/p2p/topology.rs

@@ -14,6 +14,36 @@ use poldercast::{
 use slog::Logger;
 use std::sync::{Arc, RwLock};
 
+// object holding a count of available, unreachable and quarantined nodes.
+#[derive(Clone)]
+pub struct NodeCount {
+    all_available_nodes: usize,
+    all_unreachable_nodes: usize,
+    all_quarantined_nodes: usize,
+}
+
+impl NodeCount {
+    pub fn new(nodes: &poldercast::Nodes) -> Self {
+        NodeCount {
+            all_available_nodes: nodes.all_available_nodes().len(),
+            all_unreachable_nodes: nodes.all_unreachable_nodes().len(),
+            all_quarantined_nodes: nodes.all_quarantined_nodes().len(),
+        }
+    }
+
+    pub fn all_available_nodes_count(&self) -> usize {
+        self.all_available_nodes
+    }
+
+    pub fn all_unreachable_nodes_count(&self) -> usize {
+        self.all_unreachable_nodes
+    }
+
+    pub fn all_quarantined_nodes_count(&self) -> usize {
+        self.all_quarantined_nodes
+    }
+}
+
 /// object holding the P2pTopology of the Node
 #[derive(Clone)]
 pub struct P2pTopology {
@@ -138,6 +168,10 @@ impl P2pTopology {
             .collect()
     }
 
+    pub fn nodes_count(&self) -> NodeCount {
+        NodeCount::new(self.lock.read().unwrap().nodes())
+    }
+
     /// register a strike against the given node id
     ///
     /// the function returns `None` if the node was not even in the

jormungandr/src/rest/v0/handlers.rs

@@ -156,6 +156,8 @@ async fn create_stats(context: &FullContext) -> Result<serde_json::Value, Error>
         .map_err(|e| ErrorInternalServerError(format!("Block value calculation error: {}", e)))?;
     let stats = &context.stats_counter;
     let tip_header = tip.header();
+    let stats = &context.stats_counter;
+    let nodes_count = &context.p2p.nodes_count();
     Ok(json!({
         "txRecvCnt": stats.tx_recv_cnt(),
         "blockRecvCnt": stats.block_recv_cnt(),
@@ -169,6 +171,9 @@ async fn create_stats(context: &FullContext) -> Result<serde_json::Value, Error>
         "lastBlockContentSize": tip_header.block_content_size(),
         "lastBlockSum": block_input_sum.0,
         "lastBlockFees": block_fee_sum.0,
+        "peerAvailableCnt": nodes_count.all_available_nodes_count().to_string(),
+        "peerUnreachableCnt": nodes_count.all_unreachable_nodes_count().to_string(),
+        "peerQuarantinedCnt": nodes_count.all_quarantined_nodes_count().to_string(),
     }))
 }