0.34.6_repo_cleanup

src/cache/model/entry.rs

@@ -167,7 +167,6 @@ impl Settings {
                 .any(|item| item.eq_ignore_ascii_case(extension))
     }
     pub fn annotate(&self, headers: &mut HeaderMap, outcome: &'static str, hits: u64, ttl: u64) {
-        // Origin values must never masquerade as this proxy's diagnostics.
         for name in [
             "x-cache",
             "x-cache-hits",
@@ -178,15 +177,15 @@ impl Settings {
         ] {
             headers.remove(name);
         }
-        // A vhost that explicitly disables cache must look like a normal reverse proxy.
-        // Keep counters internally, but never expose cache diagnostics for that response.
         if !self.enabled {
             return;
         }
         if let Some(value) = &self.via_header {
             headers.append(
                 http::header::VIA,
-                value.parse::<HeaderValue>().expect("validated cache Via header"),
+                value
+                    .parse::<HeaderValue>()
+                    .expect("validated cache Via header"),
             );
         }
         if self.expose_only_hits && outcome != "HIT" {
@@ -226,10 +225,15 @@ impl Settings {
         }
     }
     pub fn annotate_transformed(&self, headers: &mut HeaderMap, transformed: bool) {
-        if !self.enabled || !self.expose_cache_status || !transformed
-            || (self.expose_only_hits && !headers.get("cache-status")
-                .and_then(|value| value.to_str().ok())
-                .is_some_and(|value| value.starts_with("RustProxy; hit"))) {
+        if !self.enabled
+            || !self.expose_cache_status
+            || !transformed
+            || (self.expose_only_hits
+                && !headers
+                    .get("cache-status")
+                    .and_then(|value| value.to_str().ok())
+                    .is_some_and(|value| value.starts_with("RustProxy; hit")))
+        {
             return;
         }
         let base = headers
@@ -246,7 +250,6 @@ impl Settings {
             headers.insert("cache-status", value);
         }
     }
-    /// Reasons are fixed internal tokens: never echo request values or secrets.
     pub fn annotate_reason(
         &self,
         headers: &mut HeaderMap,
@@ -284,8 +287,6 @@ fn valid_relative_cache_path(value: &str) -> bool {
             .all(|part| matches!(part, Component::Normal(_)))
 }
 
-/// Explicit, per-vhost-only request-side cache override. It never weakens the
-/// response-side privacy guards (Set-Cookie/private/no-store/Vary rules).
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(default, deny_unknown_fields)]
 pub struct UnsafeForce {
@@ -294,7 +295,10 @@ pub struct UnsafeForce {
 }
 impl UnsafeForce {
     pub fn validate(&self) -> Result<()> {
-        ensure!(self.targets.len() <= 32, "forced cache supports at most 32 target prefixes");
+        ensure!(
+            self.targets.len() <= 32,
+            "forced cache supports at most 32 target prefixes"
+        );
         for target in &self.targets {
             ensure!(
                 !target.is_empty()
@@ -305,7 +309,10 @@ impl UnsafeForce {
                 "forced cache targets must be 1..2048 byte origin-form path/query prefixes"
             );
             let path = target.split('?').next().unwrap_or(target);
-            ensure!(crate::acl::routing_path(path)? == path, "forced cache target path must be normalized");
+            ensure!(
+                crate::acl::routing_path(path)? == path,
+                "forced cache target path must be normalized"
+            );
         }
         Ok(())
     }
@@ -323,8 +330,6 @@ impl UnsafeForce {
     }
 }
 
-/// Per-vhost behavior, not independent memory pools. None inherits the global
-/// default; the global resident-byte/entry/object ceilings remain hard limits.
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(default, deny_unknown_fields)]
 pub struct Overrides {
@@ -341,15 +346,12 @@ pub struct Overrides {
     pub expose_cache_status: Option<bool>,
     pub expose_resident_age: Option<bool>,
     pub expose_only_hits: Option<bool>,
-    /// Deliberately unavailable in the global cache configuration.
     pub unsafe_force: UnsafeForce,
 }
 impl Overrides {
     pub fn resolve(&self, global: &Settings) -> Result<Settings> {
         self.unsafe_force.validate()?;
         let mut result = global.clone();
-        // A vhost may narrow the global policy, but can never re-enable a cache
-        // that the administrator disabled globally.
         result.enabled = global.enabled && self.enabled.unwrap_or(true);
         if let Some(value) = self.default_ttl_seconds {
             result.default_ttl_seconds = value;
@@ -444,7 +446,6 @@ pub struct View {
     pub hot_eviction_limited: u64,
     pub purges: u64,
     pub entries: usize,
-    /// Compatibility alias for HOT allocated/charged bytes.
     pub resident_bytes: usize,
     pub hot_logical_bytes: usize,
     pub hot_allocated_bytes: usize,
@@ -474,16 +475,11 @@ pub struct View {
     pub proactive_skipped: u64,
     pub proactive_inflight: u64,
     pub fills_active: usize,
-    /// Bytes currently allocated by in-progress response cache fills.
     pub fill_bytes_active: u64,
-    /// Demoted objects accepted by the bounded cold-writer queue.
     pub cold_queue_items: u64,
     pub cold_queue_bytes: u64,
-    /// Body bytes currently owned by the cold writer after leaving the queue.
     pub cold_write_bytes_active: u64,
-    /// Full cold bodies currently read into RAM for promotion.
     pub cold_read_bytes_active: u64,
-    /// RustProxy-accounted cache RAM outside the published hot store.
     pub transient_bytes: u64,
     pub hit_ratio: f64,
 }