[pbs-devel] [PATCH backup 6/8] create a CachedSchema struct

[Maximiliano Sandoval <m.sandoval@proxmox.com>]

Fix the type_complexity clippy lint.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 src/api2/config/acme.rs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/api2/config/acme.rs b/src/api2/config/acme.rs
index 422b9720..99832d1d 100644
--- a/src/api2/config/acme.rs
+++ b/src/api2/config/acme.rs
@@ -428,9 +428,13 @@ impl Serialize for ChallengeSchemaWrapper {
     }
 }
 
+struct CachedSchema {
+    schema: Arc<Vec<AcmeChallengeSchema>>,
+    cached_mtime: SystemTime,
+}
+
 fn get_cached_challenge_schemas() -> Result<ChallengeSchemaWrapper, Error> {
-    static CACHE: LazyLock<Mutex<Option<(Arc<Vec<AcmeChallengeSchema>>, SystemTime)>>> =
-        LazyLock::new(|| Mutex::new(None));
+    static CACHE: LazyLock<Mutex<Option<CachedSchema>>> = LazyLock::new(|| Mutex::new(None));
 
     // the actual loading code
     let mut last = CACHE.lock().unwrap();
@@ -438,10 +442,16 @@ fn get_cached_challenge_schemas() -> Result<ChallengeSchemaWrapper, Error> {
     let actual_mtime = fs::metadata(crate::config::acme::ACME_DNS_SCHEMA_FN)?.modified()?;
 
     let schema = match &*last {
-        Some((schema, cached_mtime)) if *cached_mtime >= actual_mtime => schema.clone(),
+        Some(CachedSchema {
+            schema,
+            cached_mtime,
+        }) if *cached_mtime >= actual_mtime => schema.clone(),
         _ => {
             let new_schema = Arc::new(crate::config::acme::load_dns_challenge_schema()?);
-            *last = Some((Arc::clone(&new_schema), actual_mtime));
+            *last = Some(CachedSchema {
+                schema: Arc::clone(&new_schema),
+                cached_mtime: actual_mtime,
+            });
             new_schema
         }
     };
-- 
2.39.5



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel