Merge branch 'main' into async-krill-signer-1142

NLnetLabs · Oct 27, 2023 · 6e7e34b · 6e7e34b
2 parents 18337c8 + e4e68ec
commit 6e7e34b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/commons/crypto/signing/signers/probe.rs b/src/commons/crypto/signing/signers/probe.rs
@@ -340,7 +340,7 @@ pub mod tests {
         let config = Arc::new(Config::default());
 
         // Probing is only done when .get() is called
-        let conn = StatefulProbe::<_, SomeError, State>::new("dummy".to_string(), config, Duration::from_millis(100));
+        let conn = StatefulProbe::<_, SomeError, State>::new("dummy".to_string(), config, Duration::from_millis(200));
         assert_eq!(None, conn.last_probe_time()?);
 
         // The first call to .get() should trigger a probe
@@ -355,7 +355,7 @@ pub mod tests {
         assert!(t2 == t1);
 
         // A call to .get() after the next probe interval SHOULD result in an updated last probe time
-        std::thread::sleep(Duration::from_millis(200));
+        std::thread::sleep(Duration::from_millis(191)); // plus 10 earlier is >200
         let _probe3 = conn.status(|_, _| Err(ProbeError::AwaitingNextProbe));
         let t3 = conn.last_probe_time()?;
         assert!(t3 > t1);

diff --git a/src/daemon/http/server.rs b/src/daemon/http/server.rs
@@ -803,7 +803,7 @@ pub async fn metrics(req: Request) -> RoutingResult {
 
                     res.push('\n');
                     res.push_str("# HELP krill_cas_bgp_roas_total total number of ROAs for this CA\n");
-                    res.push_str("# TYPE krill_cas_bgp_roas_stale gauge\n");
+                    res.push_str("# TYPE krill_cas_bgp_roas_total gauge\n");
                     for (ca, nr) in all_bgp_stats.roas_total.iter() {
                         res.push_str(&format!("krill_cas_bgp_roas_total{{ca=\"{}\"}} {}\n", ca, nr));
                     }