Attempt to eliminate stale peers.

Revertron · May 27, 2023 · 0930314 · 0930314
1 parent e2f0fdf
commit 0930314
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/p2p/peers.rs b/src/p2p/peers.rs
@@ -268,18 +268,18 @@ impl Peers {
                     registry.reregister(stream, *token, Interest::WRITABLE | Interest::READABLE).unwrap();
                 }
             } else {
+                if !matches!(peer.get_state(), State::Connecting {..}) && (peer.get_state().is_timed_out() || !peer.active()) {
+                    stale_tokens.push((token.clone(), peer.get_addr()));
+                    continue;
+                }
                 if matches!(peer.get_state(), State::Message {..}) {
-                    if !peer.active() {
-                        stale_tokens.push((token.clone(), peer.get_addr()));
-                        continue;
-                    }
                     let stream = peer.get_stream();
                     registry.reregister(stream, *token, Interest::WRITABLE).unwrap();
                 }
             }
         }
         for (token, addr) in &stale_tokens {
-            info!("Closing stale peer from {}", addr);
+            info!("Closing stale (timed out) peer from {}", addr);
             self.close_peer(registry, token);
         }
 

diff --git a/src/p2p/state.rs b/src/p2p/state.rs
@@ -36,6 +36,17 @@ impl State {
         matches!(self, State::Idle { .. })
     }
 
+    pub fn is_timed_out(&self) -> bool {
+        match self {
+            State::Error => true,
+            State::Banned => true,
+            State::Idle { from } => {
+                from.elapsed().as_secs() > 60
+            }
+            _ => false
+        }
+    }
+
     pub fn is_loop(&self) -> bool {
         matches!(self, State::Loop { .. } | State::SendLoop { .. })
     }