diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-08-31 17:42:31 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-08-31 17:42:31 +0200 |
| commit | c9bc9d89de326e598da2b2ffbf5d09b158005b9a (patch) | |
| tree | 11884387ad0dd2e5e7ce10f07608862e9b59735f /src | |
| parent | 322dafc761295df45c081183c5fc059a750a3249 (diff) | |
| parent | eb97e13a6a02106520665011f5d30b60e37b730e (diff) | |
| download | garage-c9bc9d89de326e598da2b2ffbf5d09b158005b9a.tar.gz garage-c9bc9d89de326e598da2b2ffbf5d09b158005b9a.zip | |
Merge branch 'lx-perf-improvements' into netapp-stream-body
Diffstat (limited to 'src')
| -rw-r--r-- | src/garage/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/garage/main.rs | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index 1e96f1f3..31aa270d 100644 --- a/src/garage/Cargo.toml +++ b/src/garage/Cargo.toml @@ -35,7 +35,7 @@ bytesize = "1.1" timeago = "0.3" hex = "0.4" tracing = { version = "0.1.30", features = ["log-always"] } -pretty_env_logger = "0.4" +tracing-subscriber = { version = "0.3", features = ["env-filter"] } rand = "0.8" async-trait = "0.1.7" sodiumoxide = { version = "0.2.5-0", package = "kuska-sodiumoxide" } diff --git a/src/garage/main.rs b/src/garage/main.rs index 89888884..f6e694f3 100644 --- a/src/garage/main.rs +++ b/src/garage/main.rs @@ -59,7 +59,10 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "netapp=info,garage=info") } - pretty_env_logger::init(); + tracing_subscriber::fmt() + .with_writer(std::io::stderr) + .with_env_filter(tracing_subscriber::filter::EnvFilter::from_default_env()) + .init(); sodiumoxide::init().expect("Unable to init sodiumoxide"); // Abort on panic (same behavior as in Go) |