Merge branch 'alboyer-fix_custom_timestamp_format'

examples/rotate.rs

@@ -0,0 +1,28 @@
+use flexi_logger::{
+    Age, Cleanup, Criterion, Duplicate, FileSpec, FlexiLoggerError, LevelFilter, Logger, Naming,
+};
+use std::{thread::sleep, time::Duration};
+
+fn main() -> Result<(), FlexiLoggerError> {
+    Logger::with(LevelFilter::Info)
+        .rotate(
+            Criterion::Age(Age::Second),
+            Naming::TimestampsCustomFormat {
+                current_infix: None,
+                format: "%Y%m%d_%H%M%S",
+            },
+            Cleanup::Never,
+        )
+        .log_to_file(FileSpec::default())
+        .duplicate_to_stdout(Duplicate::All)
+        .start()?;
+
+    log::info!("start");
+    for step in 0..10 {
+        log::info!("step {}", step);
+        sleep(Duration::from_millis(250));
+    }
+    log::info!("done");
+
+    Ok(())
+}

src/writers/file_log_writer/state.rs

@@ -430,7 +430,7 @@ impl State {
                         } else {
                             *ts = Local::now();
                             self.config.file_spec.collision_free_infix_for_rotated_file(
-                                &infix_from_timestamp(ts, self.config.use_utc, &InfixFormat::Std),
+                                &infix_from_timestamp(ts, self.config.use_utc, fmt),
                             )
                         }
                     }