Skip to content

Commit

Permalink
Update time crate to 0.3.5
Browse files Browse the repository at this point in the history
This also switches the timestamp format from local timezone to UTC since
getting the local timezone is fallible.  Rather than complicating the
code with a fallback to UTC, just use UTC all the time.

See time-rs/time#380 and time-rs/time#293 for more discussion.
  • Loading branch information
jamessan committed Jan 9, 2022
1 parent ed35d03 commit d8b923c
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 6 deletions.
21 changes: 17 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion alacritty/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ version = "0.1.0"
[dependencies]
clap = { version = "3.0.0", features = ["derive"] }
log = { version = "0.4", features = ["std", "serde"] }
time = "0.1.40"
time = { version = "0.3.5", features = ["formatting", "macros"] }
fnv = "1"
serde = { version = "1", features = ["derive"] }
serde_yaml = "0.8"
Expand Down
8 changes: 7 additions & 1 deletion alacritty/src/logging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ use std::{env, process};

use glutin::event_loop::EventLoopProxy;
use log::{self, Level, LevelFilter};
use time::macros::format_description;
use time::OffsetDateTime;

use crate::cli::Options;
use crate::event::{Event, EventType};
Expand Down Expand Up @@ -128,7 +130,11 @@ impl log::Log for Logger {
}

fn create_log_message(record: &log::Record<'_>, target: &str) -> String {
let now = time::strftime("%F %T.%f", &time::now()).unwrap();
let now = OffsetDateTime::now_utc()
.format(format_description!(
"[year]-[month]-[day] [hour repr:24]:[minute]:[second].[subsecond digits:9]Z"
))
.unwrap();
let mut message = format!("[{}] [{:<5}] [{}] ", now, record.level(), target);

// Alignment for the lines after the first new line character in the payload. We don't deal
Expand Down

0 comments on commit d8b923c

Please sign in to comment.