diff --git a/Cargo.lock b/Cargo.lock index 5d172a2..a07380d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,8 +60,9 @@ version = "0.1.0" dependencies = [ "anyhow", "aquatic_toml_config", + "log", "serde", - "simplelog", + "simple_logger", "toml", ] @@ -201,7 +202,7 @@ dependencies = [ "signal-hook", "slab", "socket2 0.4.4", - "time 0.3.7", + "time", "tinytemplate", ] @@ -499,19 +500,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "time 0.1.43", - "winapi 0.3.9", -] - [[package]] name = "clap" version = "2.34.0" @@ -523,6 +511,17 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi 0.3.9", +] + [[package]] name = "concurrent-queue" version = "1.2.2" @@ -1893,14 +1892,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c970da16e7c682fa90a261cf0724dee241c9f7831635ecc4e988ae8f3b505559" [[package]] -name = "simplelog" -version = "0.11.2" +name = "simple_logger" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1348164456f72ca0116e4538bdaabb0ddb622c7d9f16387c725af3e96d6001c" +checksum = "c75a9723083573ace81ad0cdfc50b858aa3c366c48636edb4109d73122a0c0ea" dependencies = [ - "chrono", + "atty", + "colored", "log", - "termcolor", + "time", + "winapi 0.3.9", ] [[package]] @@ -1995,15 +1996,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - [[package]] name = "terminal_size" version = "0.1.17" @@ -2043,16 +2035,6 @@ dependencies = [ "syn", ] -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "time" version = "0.3.7" @@ -2062,8 +2044,15 @@ dependencies = [ "itoa 1.0.1", "libc", "num_threads", + "time-macros", ] +[[package]] +name = "time-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6" + [[package]] name = "tinytemplate" version = "1.2.1" diff --git a/aquatic_cli_helpers/Cargo.toml b/aquatic_cli_helpers/Cargo.toml index 853b635..8094be5 100644 --- a/aquatic_cli_helpers/Cargo.toml +++ b/aquatic_cli_helpers/Cargo.toml @@ -11,6 +11,7 @@ repository = "https://github.com/greatest-ape/aquatic" aquatic_toml_config = "0.1.0" anyhow = "1" +log = "0.4" serde = { version = "1", features = ["derive"] } -simplelog = "0.11" +simple_logger = { version = "2", features = ["stderr"] } toml = "0.5" diff --git a/aquatic_cli_helpers/src/lib.rs b/aquatic_cli_helpers/src/lib.rs index a6598c1..39b7585 100644 --- a/aquatic_cli_helpers/src/lib.rs +++ b/aquatic_cli_helpers/src/lib.rs @@ -3,8 +3,9 @@ use std::io::Read; use anyhow::Context; use aquatic_toml_config::TomlConfig; +use log::LevelFilter; use serde::{de::DeserializeOwned, Deserialize, Serialize}; -use simplelog::{ColorChoice, ConfigBuilder, LevelFilter, TermLogger, TerminalMode}; +use simple_logger::SimpleLogger; /// Log level. Available values are off, error, warn, info, debug and trace. #[derive(Debug, Clone, Copy, PartialEq, TomlConfig, Serialize, Deserialize)] @@ -186,19 +187,11 @@ fn start_logger(log_level: LogLevel) -> ::anyhow::Result<()> { LogLevel::Trace => LevelFilter::Trace, }; - // Note: logger doesn't seem to pick up thread names. Not a huge loss. - let simplelog_config = ConfigBuilder::new() - .set_time_to_local(true) - .set_location_level(LevelFilter::Off) - .build(); - - TermLogger::init( - level_filter, - simplelog_config, - TerminalMode::Stderr, - ColorChoice::Auto, - ) - .context("Couldn't initialize logger")?; + SimpleLogger::new() + .with_level(level_filter) + .with_utc_timestamps() + .init() + .context("Couldn't initialize logger")?; Ok(()) }