Use defensive programming

libp2p · Dec 3, 2023 · 75889e1 · 75889e1
1 parent 9c7b8e8
commit 75889e1
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
@@ -2084,12 +2084,19 @@ where
     }
 
     fn maybe_bootstrap(&mut self) {
-        if self.current_automated_bootstrap.is_none() {
-            match self.bootstrap() {
-                Ok(query_id) => self.current_automated_bootstrap = Some(query_id),
-                Err(_) => self.current_automated_bootstrap = None,
-            }
+        if self.current_automated_bootstrap.is_some() {
+            return;
         }
+
+        let query_id = match self.bootstrap() {
+            Ok(id) => id,
+            Err(e) => {
+                tracing::warn!("skipping automated bootstrap: {e}");
+                return;
+            }
+        };
+
+        self.current_automated_bootstrap = Some(query_id);
     }
 
     /// Preloads a new [`Handler`] with requests that are waiting to be sent to the newly connected peer.