Make sure the thread sleep doesn't get negative values at runtime

Author: Thomas Luijken

oxybox/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "oxybox"
-version = "1.0.5"
+version = "1.0.6"
 authors = ["Thomas Luijken"]
 categories = ["command-line-utilities"]
 description = "A drop in replacement for blackbox exporter for Prometheus, with support for TLS and HTTP/3."

oxybox/src/http_probe/probe.rs

@@ -243,30 +243,38 @@ pub async fn run_probe_loop(
             let org_id = org_config.organisation_id.clone();
             let mimir_endpoint = mimir_endpoint.clone();
 
-            let probe_timeout_duration: Duration = Duration::from_secs(org_config.polling_interval_seconds);
-
-            handles.push(tokio::spawn(tokio::time::timeout(probe_timeout_duration, async move {
-                handle_target_probe(
-                    tenant_name,
-                    &org_id,
-                    &target,
-                    &connector,
-                    &resolver,
-                    &mimir_endpoint,
-                    max_org_width,
-                )
-                .await;
-            })));
+            let probe_timeout_duration: Duration =
+                Duration::from_secs(org_config.polling_interval_seconds);
+
+            handles.push(tokio::spawn(tokio::time::timeout(
+                probe_timeout_duration,
+                async move {
+                    handle_target_probe(
+                        tenant_name,
+                        &org_id,
+                        &target,
+                        &connector,
+                        &resolver,
+                        &mimir_endpoint,
+                        max_org_width,
+                    )
+                    .await;
+                },
+            )));
         }
 
         for handle in handles {
             if let Err(join_err) = handle.await {
                 log::error!("Task panicked: {:?}", join_err);
             }
         }
-        let elapsed = start_time.elapsed();
+        let elapsed = start_time.elapsed().as_secs();
+        let wait = org_config
+            .polling_interval_seconds
+            .checked_sub(elapsed)
+            .unwrap_or(0);
 
-        sleep(Duration::from_secs(org_config.polling_interval_seconds - elapsed.as_secs())).await;
+        sleep(Duration::from_secs(wait)).await;
     }
 }