diff --git a/tracing-appender/Cargo.toml b/tracing-appender/Cargo.toml index e8f21ff3a..4d9a9b98e 100644 --- a/tracing-appender/Cargo.toml +++ b/tracing-appender/Cargo.toml @@ -20,6 +20,11 @@ keywords = ["logging", "tracing", "file-appender", "non-blocking-writer"] edition = "2018" rust-version = "1.53.0" +[features] + +# Enables support for rolling file using local time +local-time = ["time/local-offset"] + [dependencies] crossbeam-channel = "0.5.5" time = { version = "0.3.2", default-features = false, features = ["formatting", "parsing"] } diff --git a/tracing-appender/src/rolling.rs b/tracing-appender/src/rolling.rs index 3c9a61a47..50f922fd8 100644 --- a/tracing-appender/src/rolling.rs +++ b/tracing-appender/src/rolling.rs @@ -209,12 +209,19 @@ impl RollingFileAppender { }) } + #[cfg(test)] + #[inline] + fn now(&self) -> OffsetDateTime { + (self.now)() + } + + #[cfg(not(test))] #[inline] fn now(&self) -> OffsetDateTime { - #[cfg(test)] - return (self.now)(); + #[cfg(feature = "local-time")] + return OffsetDateTime::now_local().unwrap_or_else(|_| OffsetDateTime::now_utc()); - #[cfg(not(test))] + #[cfg(not(feature = "local-time"))] OffsetDateTime::now_utc() } }