From eb8df21e2ece133c55bbd49a6bd61b06db454172 Mon Sep 17 00:00:00 2001
From: Mike Dilger <mike@mikedilger.com>
Date: Mon, 26 Dec 2022 13:17:22 +1300
Subject: [PATCH] overlord: refactor handle_tasknextjoined()

---
 src/overlord/mod.rs | 137 +++++++++++++++++---------------------------
 1 file changed, 52 insertions(+), 85 deletions(-)

diff --git a/src/overlord/mod.rs b/src/overlord/mod.rs
index 26e6beb0..0b9e0b9e 100644
--- a/src/overlord/mod.rs
+++ b/src/overlord/mod.rs
@@ -73,49 +73,9 @@ impl Overlord {
 
         // Listen on self.minions until it is empty
         while !self.minions.is_empty() {
-            let task_next_joined = self.minions.join_next_with_id().await;
-            if task_next_joined.is_none() {
-                continue;
-            } // rare but possible
-            match task_next_joined.unwrap() {
-                Err(join_error) => {
-                    let id = join_error.id();
-                    let maybe_url = self.minions_task_url.get(&id);
-                    match maybe_url {
-                        Some(url) => {
-                            // JoinError also has is_cancelled, is_panic, into_panic, try_into_panic
-                            // Minion probably alreaedy logged, this may be redundant.
-                            warn!("Minion {} completed with error: {}", &url, join_error);
+            let task_nextjoined = self.minions.join_next_with_id().await;
 
-                            // Minion probably already logged failure in relay table
-
-                            // Remove from our urls_watching vec
-                            self.urls_watching.retain(|value| value != url);
-
-                            // Remove from our hashmap
-                            self.minions_task_url.remove(&id);
-                        }
-                        None => {
-                            warn!("Minion UNKNOWN completed with error: {}", join_error);
-                        }
-                    }
-                }
-                Ok((id, _)) => {
-                    let maybe_url = self.minions_task_url.get(&id);
-                    match maybe_url {
-                        Some(url) => {
-                            info!("Relay Task {} completed", &url);
-
-                            // Remove from our urls_watching vec
-                            self.urls_watching.retain(|value| value != url);
-
-                            // Remove from our hashmap
-                            self.minions_task_url.remove(&id);
-                        }
-                        None => warn!("Relay Task UNKNOWN completed"),
-                    }
-                }
-            }
+            self.handle_task_nextjoined(task_nextjoined).await;
         }
 
         info!("Overlord confirms all minions have shutdown");
@@ -288,55 +248,62 @@ impl Overlord {
                 };
                 keepgoing = self.handle_bus_message(bus_message).await?;
             },
-            task_next_joined = self.minions.join_next_with_id() => {
-                if task_next_joined.is_none() {
-                    return Ok(true); // rare but possible
-                }
-                match task_next_joined.unwrap() {
-                    Err(join_error) => {
-                        let id = join_error.id();
-                        let maybe_url = self.minions_task_url.get(&id);
-                        match maybe_url {
-                            Some(url) => {
-                                // JoinError also has is_cancelled, is_panic, into_panic, try_into_panic
-                                // Minion probably alreaedy logged, this may be redundant.
-                                warn!("Minion {} completed with error: {}", &url, join_error);
-
-                                // Minion probably already logged failure in relay table
-
-                                // Remove from our urls_watching vec
-                                self.urls_watching.retain(|value| value != url);
-
-                                // Remove from our hashmap
-                                self.minions_task_url.remove(&id);
-                            },
-                            None => {
-                                warn!("Minion UNKNOWN completed with error: {}", join_error);
-                            }
-                        }
-                    },
-                    Ok((id, _)) => {
-                        let maybe_url = self.minions_task_url.get(&id);
-                        match maybe_url {
-                            Some(url) => {
-                                warn!("Relay Task {} completed", &url);
-
-                                // Remove from our urls_watching vec
-                                self.urls_watching.retain(|value| value != url);
-
-                                // Remove from our hashmap
-                                self.minions_task_url.remove(&id);
-                            },
-                            None => warn!("Relay Task UNKNOWN completed"),
-                        }
-                    }
-                }
+            task_nextjoined = self.minions.join_next_with_id() => {
+                self.handle_task_nextjoined(task_nextjoined).await;
             }
         }
 
         Ok(keepgoing)
     }
 
+    async fn handle_task_nextjoined(
+        &mut self,
+        task_nextjoined: Option<Result<(task::Id, ()), task::JoinError>>,
+    ) {
+        if task_nextjoined.is_none() {
+            return; // rare but possible
+        }
+        match task_nextjoined.unwrap() {
+            Err(join_error) => {
+                let id = join_error.id();
+                let maybe_url = self.minions_task_url.get(&id);
+                match maybe_url {
+                    Some(url) => {
+                        // JoinError also has is_cancelled, is_panic, into_panic, try_into_panic
+                        // Minion probably alreaedy logged, this may be redundant.
+                        warn!("Minion {} completed with error: {}", &url, join_error);
+
+                        // Minion probably already logged failure in relay table
+
+                        // Remove from our urls_watching vec
+                        self.urls_watching.retain(|value| value != url);
+
+                        // Remove from our hashmap
+                        self.minions_task_url.remove(&id);
+                    }
+                    None => {
+                        warn!("Minion UNKNOWN completed with error: {}", join_error);
+                    }
+                }
+            }
+            Ok((id, _)) => {
+                let maybe_url = self.minions_task_url.get(&id);
+                match maybe_url {
+                    Some(url) => {
+                        warn!("Relay Task {} completed", &url);
+
+                        // Remove from our urls_watching vec
+                        self.urls_watching.retain(|value| value != url);
+
+                        // Remove from our hashmap
+                        self.minions_task_url.remove(&id);
+                    }
+                    None => warn!("Relay Task UNKNOWN completed"),
+                }
+            }
+        }
+    }
+
     async fn handle_bus_message(&mut self, bus_message: BusMessage) -> Result<bool, Error> {
         #[allow(clippy::single_match)] // because temporarily so
         match &*bus_message.target {