diff options
Diffstat (limited to 'src/garage')
| -rw-r--r-- | src/garage/Cargo.toml | 6 | ||||
| -rw-r--r-- | src/garage/main.rs | 5 | ||||
| -rw-r--r-- | src/garage/tests/lib.rs | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index b08e9439..f30b88ac 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" } @@ -63,9 +63,9 @@ prometheus = { version = "0.13", optional = true } aws-sdk-s3 = "0.8" chrono = "0.4" http = "0.2" -hmac = "0.10" +hmac = "0.12" hyper = { version = "0.14", features = ["client", "http1", "runtime"] } -sha2 = "0.9" +sha2 = "0.10" static_init = "1.0" assert-json-diff = "2.0" diff --git a/src/garage/main.rs b/src/garage/main.rs index 77d5db24..0eca24ae 100644 --- a/src/garage/main.rs +++ b/src/garage/main.rs @@ -68,7 +68,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) diff --git a/src/garage/tests/lib.rs b/src/garage/tests/lib.rs index d15639b9..87be1327 100644 --- a/src/garage/tests/lib.rs +++ b/src/garage/tests/lib.rs @@ -3,6 +3,8 @@ mod common; mod admin; mod bucket; + +mod s3; + #[cfg(feature = "k2v")] mod k2v; -mod s3; |