feat(node): add markers for initial connection attempt/timeout

Added AttemptingNetworkConnection marker/is_conn_active boolean for initial network activity and a NetworkConnectionTimedOut marker/error message if connection is timed out.
maidsafe · Jul 27, 2023 · ca099aa · ca099aa
1 parent 26c13ef
commit ca099aa
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/sn_networking/src/event.rs b/sn_networking/src/event.rs
@@ -288,7 +288,6 @@ impl SwarmDriver {
                 peer_id,
                 connection_id,
             } => trace!("Dialing {peer_id:?} on {connection_id:?}"),
-
             SwarmEvent::Behaviour(NodeEvent::Autonat(event)) => match event {
                 autonat::Event::InboundProbe(e) => debug!("AutoNAT inbound probe: {e:?}"),
                 autonat::Event::OutboundProbe(e) => debug!("AutoNAT outbound probe: {e:?}"),

diff --git a/sn_node/src/api.rs b/sn_node/src/api.rs
@@ -115,6 +115,7 @@ impl Node {
         let network_clone = network.clone();
         let node_event_sender = node_events_channel.clone();
         let mut rng = StdRng::from_entropy();
+        let mut is_conn_active = false;
 
         let initial_join_flows_done = Arc::new(AtomicBool::new(false));
         let peers_connected = Arc::new(AtomicUsize::new(0));
@@ -134,6 +135,10 @@ impl Node {
                     net_event = network_event_receiver.recv() => {
                         match net_event {
                             Some(event) => {
+                                if is_conn_active == false {
+                                    is_conn_active = true;
+                                    Marker::AttemptingNetworkConnection.log();
+                                }
                                 let mut stateless_node_copy = node.clone();
                                 let _handle =
                                     spawn(async move { stateless_node_copy.handle_network_event(event, peers_connected, initial_join_flows_done).await });
@@ -150,9 +155,14 @@ impl Node {
 
                         Marker::NoNetworkActivity( inactivity_timeout ).log();
                         debug!("No network activity in the past {inactivity_timeout:?}, performing a random get_closest query to target: {random_target:?}");
-                        if let Ok(closest) = network_clone.node_get_closest_peers(&random_target).await {
-                            debug!("Network inactivity: get_closest returned {closest:?}");
-                        }
+                        match network_clone.node_get_closest_peers(&random_target).await {
+                            Ok(closest) => { debug!("Network inactivity: get_closest returned {closest:?}"); },
+                            Err(e) => {
+                                is_conn_active = false;
+                                Marker::NetworkConnectionTimedOut.log();
+                                println!("Network connection has timed out: {}", e); 
+                            },
+                        } 
                     }
                 }
             }

diff --git a/sn_node/src/log_markers.rs b/sn_node/src/log_markers.rs
@@ -17,6 +17,12 @@ use strum::Display;
 /// Changing these log markers is a breaking change.
 #[derive(Debug, Clone, Display)]
 pub enum Marker<'a> {
+    /// Detected initial network activity
+    AttemptingNetworkConnection,
+
+    /// Network connection has timed out after a period of no network activity
+    NetworkConnectionTimedOut,
+
     /// The node has started
     NodeConnectedToNetwork,