v0.30.0

src/admin/file_logs_io.rs

@@ -1,3 +1,29 @@
+// Bound candidate retention while scanning potentially enormous rotation folders.
+// The heap's top is the least desirable result: oldest timestamp, then
+// lexicographically last name. Final output preserves newest/name order.
+fn newest_log_files(
+    candidates: impl Iterator<Item = (String, std::path::PathBuf, u64)>,
+    limit: usize,
+) -> Vec<(String, std::path::PathBuf, u64)> {
+    use std::{cmp::Reverse, collections::BinaryHeap};
+    if limit == 0 { return Vec::new(); }
+    let mut bounded = BinaryHeap::with_capacity(limit);
+    for (name, path, modified_ms) in candidates {
+        let item = (Reverse(modified_ms), name, path);
+        if bounded.len() < limit {
+            bounded.push(item);
+        } else if bounded.peek().is_some_and(|worst| item.cmp(worst).is_lt()) {
+            bounded.pop();
+            bounded.push(item);
+        }
+    }
+    let mut result = bounded.into_iter()
+        .map(|(Reverse(modified), name, path)| (name, path, modified))
+        .collect::<Vec<_>>();
+    result.sort_by(|a, b| b.2.cmp(&a.2).then_with(|| a.0.cmp(&b.0)));
+    result
+}
+
 // Bounded file-log inventory helpers and gzip tail reader.
 fn rotated_gzip_sources(
     active: &std::path::Path,
@@ -12,16 +38,14 @@ fn rotated_gzip_sources(
     let safe = std::fs::symlink_metadata(parent).ok().is_some_and(|meta| meta.file_type().is_dir() && !meta.file_type().is_symlink());
     if !safe { return Vec::new(); }
     let prefix = format!("{base}.");
-    let mut entries = std::fs::read_dir(parent).ok().into_iter().flat_map(|iter| iter.filter_map(|entry| entry.ok())).filter_map(|entry| {
+    let entries = newest_log_files(std::fs::read_dir(parent).ok().into_iter().flat_map(|iter| iter.filter_map(|entry| entry.ok())).filter_map(|entry| {
         let name = entry.file_name().to_string_lossy().into_owned();
         if name.len() > 180 || !name.starts_with(&prefix) || !name.ends_with(".gz") { return None; }
         let file_type = entry.file_type().ok()?;
         if !file_type.is_file() || file_type.is_symlink() { return None; }
         let meta = entry.metadata().ok()?;
         Some((name, entry.path(), file_modified_ms(&meta)))
-    }).collect::<Vec<_>>();
-    entries.sort_by(|a,b| b.2.cmp(&a.2).then_with(|| a.0.cmp(&b.0)));
-    entries.truncate(64);
+    }), 64);
     entries.into_iter().map(|(name,path,_)| source_from_path(
         format!("{id_prefix}:gz:{name}"),
         format!("{label_prefix} · {name}"),