Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 2.0.0 #53

Merged
merged 4 commits into from
Jan 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "simple_logger"
version = "1.16.0"
version = "2.0.0"
license = "MIT"
authors = ["Sam Clements <[email protected]>"]
description = "A logger that prints all messages with a readable output format"
Expand Down Expand Up @@ -32,10 +32,18 @@ required-features = ["colors"]
name = "threads"
required-features = ["threads"]

[[example]]
name = "timestamps_local"
required-features = ["timestamps"]

[[example]]
name = "timestamps_none"
required-features = ["timestamps"]

[[example]]
name = "timestamps_utc"
required-features = ["timestamps"]

[[example]]
name = "timestamps_local"
name = "timestamps_utc_offset"
required-features = ["timestamps"]
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@

A logger that prints all messages with a readable output format.

The output format is based on the format used by [Supervisord](http://supervisord.org/).
The output format is based on the format used by [Supervisord](http://supervisord.org/), with timestamps in [RFC 3339](https://datatracker.ietf.org/doc/html/rfc3339) format.

* [Source on GitHub](https://github.com/borntyping/rust-simple_logger)
* [Packages on Crates.io](https://crates.io/crates/simple_logger)
* [Documentation on Docs.rs](https://docs.rs/simple_logger)

Breaking changes
----------------

- **Version 2.0.0 changes the default from displaying timestamps in the local timezone to displaying timestamps in UTC.** See issue [#52](https://github.com/borntyping/rust-simple_logger/issues/52) for more information.

Usage
-----

Expand All @@ -24,7 +29,7 @@ fn main() {
This outputs:

```
2015-02-24 01:05:20 WARN [logging_example] This is an example message.
2022-01-19T17:27:07.013874956Z WARN [logging_example] This is an example message.
```

You can run the above example with:
Expand Down
7 changes: 7 additions & 0 deletions examples/timestamps_none.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
use simple_logger::SimpleLogger;

fn main() {
SimpleLogger::new().without_timestamps().init().unwrap();

log::warn!("This is an example message.");
}
12 changes: 12 additions & 0 deletions examples/timestamps_utc_offset.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
use simple_logger::SimpleLogger;
use time::UtcOffset;

fn main() {
SimpleLogger::new()
.with_utc_offset(UtcOffset::from_hms(14, 0, 0).unwrap())
.init()
.unwrap();

log::warn!("This is an example message using a static UTC offset.");
log::info!("Daylight savings or other timezone changes will not be respected.");
}
39 changes: 29 additions & 10 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,15 @@ use colored::*;
use log::{Level, LevelFilter, Log, Metadata, Record, SetLoggerError};
use std::collections::HashMap;
#[cfg(feature = "timestamps")]
use time::{format_description::FormatItem, OffsetDateTime};

#[cfg(feature = "timestamps")]
const TIMESTAMP_FORMAT: &[FormatItem] = time::macros::format_description!(
"[year]-[month]-[day] [hour]:[minute]:[second],[subsecond digits:3]"
);
use time::{format_description::well_known::Rfc3339, OffsetDateTime, UtcOffset};

#[cfg(feature = "timestamps")]
#[derive(PartialEq)]
enum Timestamps {
None,
Local,
Utc,
UtcOffset(UtcOffset),
}

/// Implements [`Log`] and a set of simple builder methods for configuration.
Expand Down Expand Up @@ -105,7 +101,7 @@ impl SimpleLogger {
threads: false,

#[cfg(feature = "timestamps")]
timestamps: Timestamps::Local,
timestamps: Timestamps::Utc,

#[cfg(feature = "colored")]
colors: true,
Expand Down Expand Up @@ -292,6 +288,16 @@ impl SimpleLogger {
self
}

/// Display timestamps using a static UTC offset.
///
/// This method is only available if the `timestamps` feature is enabled.
#[must_use = "You must call init() to begin logging"]
#[cfg(feature = "timestamps")]
pub fn with_utc_offset(mut self, offset: UtcOffset) -> SimpleLogger {
self.timestamps = Timestamps::UtcOffset(offset);
self
}

/// Control whether messages are colored or not.
///
/// This method is only available if the `colored` feature is enabled.
Expand Down Expand Up @@ -408,13 +414,15 @@ impl Log for SimpleLogger {
Timestamps::None => "".to_string(),
Timestamps::Local => format!("{} ", OffsetDateTime::now_local().expect(concat!(
"Could not determine the UTC offset on this system. ",
"Consider displaying UTC time instead. ",
"Possible causes are that the time crate does not implement \"local_offset_at\" ",
"on your system, or that you are running in a multi-threaded environment and ",
"the time crate is returning \"None\" from \"local_offset_at\" to avoid unsafe ",
"behaviour. See the time crate's documentation for more information. ",
"(https://time-rs.github.io/internal-api/time/index.html#feature-flags)"
)).format(&TIMESTAMP_FORMAT).unwrap()),
Timestamps::Utc => format!("{} ", OffsetDateTime::now_utc().format(&TIMESTAMP_FORMAT).unwrap()),
)).format(&Rfc3339).unwrap()),
Timestamps::Utc => format!("{} ", OffsetDateTime::now_utc().format(&Rfc3339).unwrap()),
Timestamps::UtcOffset(offset) => format!("{} ", OffsetDateTime::now_utc().to_offset(offset).format(&Rfc3339).unwrap()),
}

#[cfg(not(feature = "timestamps"))]
Expand Down Expand Up @@ -478,6 +486,17 @@ pub fn init() -> Result<(), SetLoggerError> {
SimpleLogger::new().init()
}

/// Initialise the logger with it's default configuration.
///
/// Log messages will not be filtered.
/// The `RUST_LOG` environment variable is not used.
///
/// This function is only available if the `timestamps` feature is enabled.
#[cfg(feature = "timestamps")]
pub fn init_utc() -> Result<(), SetLoggerError> {
SimpleLogger::new().with_utc_timestamps().init()
}

/// Initialise the logger with the `RUST_LOG` environment variable.
///
/// Log messages will be filtered based on the `RUST_LOG` environment variable.
Expand Down Expand Up @@ -546,7 +565,7 @@ mod test {
#[cfg(feature = "timestamps")]
fn test_timestamps_defaults() {
let builder = SimpleLogger::new();
assert!(builder.timestamps == Timestamps::Local);
assert!(builder.timestamps == Timestamps::Utc);
}

#[test]
Expand Down