Update env_logger
This commit is contained in:
parent
6029f44c67
commit
e68a53c608
3 changed files with 26 additions and 33 deletions
42
Cargo.lock
generated
42
Cargo.lock
generated
|
|
@ -696,16 +696,26 @@ dependencies = [
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "env_logger"
|
name = "env_filter"
|
||||||
version = "0.10.2"
|
version = "0.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
|
checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"humantime",
|
|
||||||
"is-terminal",
|
|
||||||
"log",
|
"log",
|
||||||
"regex",
|
"regex",
|
||||||
"termcolor",
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "env_logger"
|
||||||
|
version = "0.11.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
|
||||||
|
dependencies = [
|
||||||
|
"anstream",
|
||||||
|
"anstyle",
|
||||||
|
"env_filter",
|
||||||
|
"humantime",
|
||||||
|
"log",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
@ -1853,17 +1863,6 @@ dependencies = [
|
||||||
"once_cell",
|
"once_cell",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "is-terminal"
|
|
||||||
version = "0.4.12"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
|
|
||||||
dependencies = [
|
|
||||||
"hermit-abi",
|
|
||||||
"libc",
|
|
||||||
"windows-sys 0.52.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "is-wsl"
|
name = "is-wsl"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
|
|
@ -3233,15 +3232,6 @@ dependencies = [
|
||||||
"windows-sys 0.52.0",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "termcolor"
|
|
||||||
version = "1.4.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
|
|
||||||
dependencies = [
|
|
||||||
"winapi-util",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "thiserror"
|
name = "thiserror"
|
||||||
version = "1.0.50"
|
version = "1.0.50"
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ axum-extra = { version = "0.9.3", features = ["query", "typed-routing", "typed-h
|
||||||
bytes = "1.6.0"
|
bytes = "1.6.0"
|
||||||
clap = { version = "4.5.4", features = ["derive", "deprecated"] }
|
clap = { version = "4.5.4", features = ["derive", "deprecated"] }
|
||||||
directories = "5.0.1"
|
directories = "5.0.1"
|
||||||
env_logger = "0.10.0"
|
env_logger = "0.11.3"
|
||||||
flate2 = "1.0.30"
|
flate2 = "1.0.30"
|
||||||
futures = "0.3.30"
|
futures = "0.3.30"
|
||||||
gethostname = "0.4.3"
|
gethostname = "0.4.3"
|
||||||
|
|
|
||||||
15
src/main.rs
15
src/main.rs
|
|
@ -57,7 +57,11 @@ fn set_up_logging(verbose: u8) {
|
||||||
log::Level::Info => 6,
|
log::Level::Info => 6,
|
||||||
log::Level::Debug | log::Level::Trace => 7,
|
log::Level::Debug | log::Level::Trace => 7,
|
||||||
};
|
};
|
||||||
let level = f.default_styled_level(record.level());
|
let level = {
|
||||||
|
let level = record.level();
|
||||||
|
let style = f.default_level_style(level);
|
||||||
|
format!("{style}{level:>5}{style:#}")
|
||||||
|
};
|
||||||
let args = record.args();
|
let args = record.args();
|
||||||
let module = match record.module_path() {
|
let module = match record.module_path() {
|
||||||
Some("tablejohn::server") => Some("server"),
|
Some("tablejohn::server") => Some("server"),
|
||||||
|
|
@ -70,12 +74,11 @@ fn set_up_logging(verbose: u8) {
|
||||||
None => None,
|
None => None,
|
||||||
};
|
};
|
||||||
if let Some(module) = module {
|
if let Some(module) = module {
|
||||||
let style = &mut f.style();
|
let style = env_logger::fmt::style::Style::new().bold();
|
||||||
style.set_bold(true);
|
let module = format!("{style}{module}{style:#}");
|
||||||
let module = style.value(module);
|
writeln!(f, "<{syslog_level}>[{level}] {module}: {args}")
|
||||||
writeln!(f, "<{syslog_level}>[{level:>5}] {module}: {args}")
|
|
||||||
} else {
|
} else {
|
||||||
writeln!(f, "<{syslog_level}>[{level:>5}] {args}")
|
writeln!(f, "<{syslog_level}>[{level}] {args}")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.init();
|
.init();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue