From 08e920e247e453247e20c28032bb4e03c21fa0fe Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 3 Mar 2023 21:07:44 +0100
Subject: [PATCH] hunter/scheduler: fix fetch interval reporting

---
 hunter/src/scheduler.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/hunter/src/scheduler.rs b/hunter/src/scheduler.rs
index 6735480..e972a2b 100644
--- a/hunter/src/scheduler.rs
+++ b/hunter/src/scheduler.rs
@@ -93,19 +93,16 @@ impl Scheduler {
         if let Some(time) = self.queue.keys().next().cloned() {
             if time <= now {
                 self.queue.remove(&time)
-                    .map(|host| {
-                        self.instances.get_mut(&host)
-                            .map(|instance| instance.last_fetch = Some(now));
-
-                        Ok(host)
-                    })
+                    .map(|host| Ok(host))
                     .unwrap_or(Err(Duration::from_secs(1)))
                     .map(|host| {
-                        if let Some(last_fetch) = self.instances.get(&host).and_then(|i| i.last_fetch) {
+                        let instance = self.instances.get_mut(&host);
+                        if let Some(last_fetch) = instance.as_ref().and_then(|i| i.last_fetch) {
                             tracing::debug!("Fetch {} - last before {:.0?}", host, now - last_fetch);
                         } else {
                             tracing::debug!("Fetch {} - NEW", host);
                         }
+                        instance.map(|instance| instance.last_fetch = Some(now));
                         host
                     })
             } else {