[0.31.4] Fix bug with cleanup_by_day, improve test

Author: emabee

CHANGELOG.md

@@ -5,11 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.31.3] - 2025-09-22
+## [0.31.4] - 2025-09-23
 
 Add variant `Cleanup::KeepForDays(usize)` to have log files being deleted after a given number of days.
 Kudos goes to [Tunglies](https://github.com/Tunglies).
 
+## [0.31.3] - 2025-09-22
+
+Yanked.
+
 ## [0.31.2] - 2025-06-27
 
 Add syslog-call based `SyslogWriter` connection

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flexi_logger"
-version = "0.31.3"
+version = "0.31.4"
 authors = ["emabee <[email protected]>"]
 categories = ["development-tools::debugging"]
 description = """

src/writers/file_log_writer/state/list_and_cleanup.rs

@@ -96,7 +96,7 @@ pub(crate) fn remove_or_compress_too_old_logfiles_impl(
         }
         Cleanup::KeepLogFiles(log_limit) => (log_limit, 0, 0),
 
-        Cleanup::KeepForDays(day_limit) => (0, day_limit, 0),
+        Cleanup::KeepForDays(day_limit) => (usize::MAX, day_limit, 0),
 
         #[cfg(feature = "compress")]
         Cleanup::KeepCompressedFiles(compress_limit) => (0, 0, compress_limit),

tests/test_cleanup_by_day_limit.rs

@@ -5,7 +5,10 @@ fn test_cleanup_by_day_limit() {
     use filetime::{set_file_mtime, FileTime};
     use flexi_logger::{Cleanup, Criterion, Duplicate, FileSpec, Logger, Naming};
     use log::*;
-    use std::{fs, thread, time::Duration};
+    use std::{
+        fs, thread,
+        time::{Duration, Instant, SystemTime},
+    };
 
     let directory = test_utils::dir();
 
@@ -21,47 +24,37 @@ fn test_cleanup_by_day_limit() {
         .start()
         .unwrap();
 
-    for i in 0..5 {
+    // create four "full" log files (r00000, r00001, r00002, rCURRENT)
+    for i in 0..12 {
         info!("log line {i}");
     }
 
     let mut log_files: Vec<_> = fs::read_dir(&directory)
         .unwrap()
-        .filter_map(|e| {
-            let p = e.unwrap().path();
+        .filter_map(|r_dir_entry| {
+            let p = r_dir_entry.unwrap().path();
             if p.extension().map(|ext| ext == "log").unwrap_or(false) {
                 Some(p)
             } else {
                 None
             }
         })
         .collect();
-    let two_days_ago = std::time::SystemTime::now() - Duration::from_secs(2 * 24 * 3600);
-    let ft = FileTime::from_system_time(two_days_ago);
-    for file in &log_files {
-        if file.exists() {
-            let _ = set_file_mtime(file, ft);
-        }
-    }
     log_files.sort();
-    let old_file = log_files.first().expect("should have log files");
-    let two_days_ago = std::time::SystemTime::now() - Duration::from_secs(2 * 24 * 3600);
-    let ft = FileTime::from_system_time(two_days_ago);
-    if old_file.exists() {
-        set_file_mtime(old_file, ft).unwrap();
-    }
 
-    for i in 0..3 {
-        info!("trigger cleanup {i}");
-        thread::sleep(Duration::from_millis(120));
-    }
+    // artificially age the first file...
+    let first_file = log_files.first().unwrap();
+    let two_days_ago = SystemTime::now() - Duration::from_secs(2 * 24 * 3600);
+    set_file_mtime(first_file, FileTime::from_system_time(two_days_ago)).unwrap();
 
-    let start = std::time::Instant::now();
-    while old_file.exists() && start.elapsed().as_secs() < 2 {
+    // ...and ensure it gets deleted automatically with the next rotation
+    info!("add line to trigger the cleanup");
+    let start = Instant::now();
+    while first_file.exists() && start.elapsed().as_secs() < 2 {
         thread::sleep(Duration::from_millis(50));
     }
     assert!(
-        !old_file.exists(),
+        !first_file.exists(),
         "old file should be deleted by day_limit cleanup"
     );
 }