From 68f826ef3bd58b14026ecebf3ccad8b398407c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Thu, 5 Aug 2021 20:43:03 +0300 Subject: [PATCH] Simplify tracing-subscriber initialization (#128) --- examples/404.rs | 4 +--- examples/error_handling_and_dependency_injection.rs | 4 +--- examples/form.rs | 4 +--- examples/hello_world.rs | 4 +--- examples/key_value_store.rs | 4 +--- examples/multipart_form.rs | 4 +--- examples/sessions.rs | 4 +--- examples/sse.rs | 4 +--- examples/static_file_server.rs | 4 +--- examples/templates.rs | 4 +--- examples/testing.rs | 4 +--- examples/tls_rustls.rs | 4 +--- examples/todos.rs | 4 +--- examples/tokio_postgres.rs | 4 +--- examples/unix_domain_socket.rs | 4 +--- examples/versioning.rs | 4 +--- examples/websocket.rs | 4 +--- 17 files changed, 17 insertions(+), 51 deletions(-) diff --git a/examples/404.rs b/examples/404.rs index b16b3293..76c9ce6d 100644 --- a/examples/404.rs +++ b/examples/404.rs @@ -18,9 +18,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "404=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); // build our application with a route let app = route("/", get(handler)) diff --git a/examples/error_handling_and_dependency_injection.rs b/examples/error_handling_and_dependency_injection.rs index dffc03f8..d9231374 100644 --- a/examples/error_handling_and_dependency_injection.rs +++ b/examples/error_handling_and_dependency_injection.rs @@ -28,9 +28,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "error_handling_and_dependency_injection=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); // Inject a `UserRepo` into our handlers via a trait object. This could be // the live implementation or just a mock for testing. diff --git a/examples/form.rs b/examples/form.rs index f7fa650a..da775a5a 100644 --- a/examples/form.rs +++ b/examples/form.rs @@ -14,9 +14,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "form=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); // build our application with some routes let app = route("/", get(show_form).post(accept_form)); diff --git a/examples/hello_world.rs b/examples/hello_world.rs index fa53e9d0..bdb0a877 100644 --- a/examples/hello_world.rs +++ b/examples/hello_world.rs @@ -13,9 +13,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "hello_world=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); // build our application with a route let app = route("/", get(handler)); diff --git a/examples/key_value_store.rs b/examples/key_value_store.rs index 9d00492b..5d8c913c 100644 --- a/examples/key_value_store.rs +++ b/examples/key_value_store.rs @@ -35,9 +35,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "key_value_store=debug,tower_http=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); // Build our application by composing routes let app = route( diff --git a/examples/multipart_form.rs b/examples/multipart_form.rs index 59f6466a..72ae9368 100644 --- a/examples/multipart_form.rs +++ b/examples/multipart_form.rs @@ -16,9 +16,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "multipart_form=debug,tower_http=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); // build our application with some routes let app = route("/", get(show_form).post(accept_form)) diff --git a/examples/sessions.rs b/examples/sessions.rs index 21aaaa67..c2799dd5 100644 --- a/examples/sessions.rs +++ b/examples/sessions.rs @@ -24,9 +24,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "sessions=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); // `MemoryStore` just used as an example. Don't use this in production. let store = MemoryStore::new(); diff --git a/examples/sse.rs b/examples/sse.rs index a49593c9..4544b532 100644 --- a/examples/sse.rs +++ b/examples/sse.rs @@ -17,9 +17,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "sse=debug,tower_http=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); // build our application with a route let app = nest( diff --git a/examples/static_file_server.rs b/examples/static_file_server.rs index 8bfe35e6..52582839 100644 --- a/examples/static_file_server.rs +++ b/examples/static_file_server.rs @@ -15,9 +15,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "static_file_server=debug,tower_http=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); let app = nest( "/static", diff --git a/examples/templates.rs b/examples/templates.rs index 1a3753ce..f2c5f087 100644 --- a/examples/templates.rs +++ b/examples/templates.rs @@ -15,9 +15,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "templates=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); // build our application with some routes let app = route("/greet/:name", get(greet)); diff --git a/examples/testing.rs b/examples/testing.rs index aa4505fc..b6e3d34b 100644 --- a/examples/testing.rs +++ b/examples/testing.rs @@ -13,9 +13,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "testing=debug,tower_http=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); let addr = std::net::SocketAddr::from(([127, 0, 0, 1], 3000)); diff --git a/examples/tls_rustls.rs b/examples/tls_rustls.rs index ca570028..5ce23022 100644 --- a/examples/tls_rustls.rs +++ b/examples/tls_rustls.rs @@ -21,9 +21,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "rustls=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); let rustls_config = rustls_server_config( "examples/self_signed_certs/key.pem", diff --git a/examples/todos.rs b/examples/todos.rs index ef300af3..76bc85b5 100644 --- a/examples/todos.rs +++ b/examples/todos.rs @@ -38,9 +38,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "todos=debug,tower_http=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); let db = Db::default(); diff --git a/examples/tokio_postgres.rs b/examples/tokio_postgres.rs index 8b196234..8f915220 100644 --- a/examples/tokio_postgres.rs +++ b/examples/tokio_postgres.rs @@ -17,9 +17,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "tokio_postgres=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); // setup connection pool let manager = diff --git a/examples/unix_domain_socket.rs b/examples/unix_domain_socket.rs index 3882f520..2971ea6e 100644 --- a/examples/unix_domain_socket.rs +++ b/examples/unix_domain_socket.rs @@ -40,9 +40,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); let path = PathBuf::from("/tmp/axum/helloworld"); diff --git a/examples/versioning.rs b/examples/versioning.rs index ef1e88ee..9df60371 100644 --- a/examples/versioning.rs +++ b/examples/versioning.rs @@ -20,9 +20,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "versioning=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); // build our application with some routes let app = route("/:version/foo", get(handler)); diff --git a/examples/websocket.rs b/examples/websocket.rs index c80c6da3..65399851 100644 --- a/examples/websocket.rs +++ b/examples/websocket.rs @@ -26,9 +26,7 @@ async fn main() { if std::env::var("RUST_LOG").is_err() { std::env::set_var("RUST_LOG", "websocket=debug,tower_http=debug") } - tracing_subscriber::fmt::fmt() - .with_env_filter(tracing_subscriber::EnvFilter::from_default_env()) - .init(); + tracing_subscriber::fmt::init(); // build our application with some routes let app = nest(