YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch from "simplelog" from "simple_logger" to remove "chrono" dep

Browse source
This commit is contained in:
Joakim Frostegård 2022-03-20 20:13:15 +01:00
parent 83987563ec
commit ba5a568bcd
3 changed files with 37 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Cargo.lock generated
View file

@ -60,8 +60,9 @@ version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"aquatic_toml_config", "aquatic_toml_config",
"log",
"serde", "serde",
"simplelog", "simple_logger",
"toml", "toml",
] ]
@ -201,7 +202,7 @@ dependencies = [
"signal-hook", "signal-hook",
"slab", "slab",
"socket2 0.4.4", "socket2 0.4.4",
"time 0.3.7", "time",
"tinytemplate", "tinytemplate",
] ]
@ -499,19 +500,6 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" 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]] [[package]]
name = "clap" name = "clap"
version = "2.34.0" version = "2.34.0"
@ -523,6 +511,17 @@ dependencies = [
"unicode-width", "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]] [[package]]
name = "concurrent-queue" name = "concurrent-queue"
version = "1.2.2" version = "1.2.2"
@ -1893,14 +1892,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c970da16e7c682fa90a261cf0724dee241c9f7831635ecc4e988ae8f3b505559" checksum = "c970da16e7c682fa90a261cf0724dee241c9f7831635ecc4e988ae8f3b505559"
[[package]] [[package]]
name = "simplelog" name = "simple_logger"
version = "0.11.2" version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1348164456f72ca0116e4538bdaabb0ddb622c7d9f16387c725af3e96d6001c" checksum = "c75a9723083573ace81ad0cdfc50b858aa3c366c48636edb4109d73122a0c0ea"
dependencies = [ dependencies = [
"chrono", "atty",
"colored",
"log", "log",
"termcolor", "time",
"winapi 0.3.9",
] ]
[[package]] [[package]]
@ -1995,15 +1996,6 @@ dependencies = [
"unicode-xid", "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]] [[package]]
name = "terminal_size" name = "terminal_size"
version = "0.1.17" version = "0.1.17"
@ -2043,16 +2035,6 @@ dependencies = [
"syn", "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]] [[package]]
name = "time" name = "time"
version = "0.3.7" version = "0.3.7"
@ -2062,8 +2044,15 @@ dependencies = [
"itoa 1.0.1", "itoa 1.0.1",
"libc", "libc",
"num_threads", "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]] [[package]]
name = "tinytemplate" name = "tinytemplate"
version = "1.2.1" version = "1.2.1"

3
aquatic_cli_helpers/Cargo.toml
View file

@ -11,6 +11,7 @@ repository = "https://github.com/greatest-ape/aquatic"
aquatic_toml_config = "0.1.0" aquatic_toml_config = "0.1.0"
anyhow = "1" anyhow = "1"
log = "0.4"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
simplelog = "0.11" simple_logger = { version = "2", features = ["stderr"] }
toml = "0.5" toml = "0.5"

21
aquatic_cli_helpers/src/lib.rs
View file

@ -3,8 +3,9 @@ use std::io::Read;
use anyhow::Context; use anyhow::Context;
use aquatic_toml_config::TomlConfig; use aquatic_toml_config::TomlConfig;
use log::LevelFilter;
use serde::{de::DeserializeOwned, Deserialize, Serialize}; 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. /// Log level. Available values are off, error, warn, info, debug and trace.
#[derive(Debug, Clone, Copy, PartialEq, TomlConfig, Serialize, Deserialize)] #[derive(Debug, Clone, Copy, PartialEq, TomlConfig, Serialize, Deserialize)]
@ -186,19 +187,11 @@ fn start_logger(log_level: LogLevel) -> ::anyhow::Result<()> {
LogLevel::Trace => LevelFilter::Trace, LogLevel::Trace => LevelFilter::Trace,
}; };
// Note: logger doesn't seem to pick up thread names. Not a huge loss. SimpleLogger::new()
let simplelog_config = ConfigBuilder::new() .with_level(level_filter)
.set_time_to_local(true) .with_utc_timestamps()
.set_location_level(LevelFilter::Off) .init()
.build(); .context("Couldn't initialize logger")?;
TermLogger::init(
level_filter,
simplelog_config,
TerminalMode::Stderr,
ColorChoice::Auto,
)
.context("Couldn't initialize logger")?;
Ok(()) Ok(())
} }