From 3cd0c0fd4565eea5888bd8cbcf32f128012c61d0 Mon Sep 17 00:00:00 2001 From: Spencer Gilbert Date: Thu, 5 Aug 2021 05:25:03 -0400 Subject: [PATCH] Set RUST_LOG environment var for all examples using tracing (#123) * Set RUST_LOG environment var for all examples using tracing Signed-off-by: Spencer Gilbert * Update examples/multipart_form.rs Co-authored-by: David Pedersen --- examples/404.rs | 8 +++++++- examples/error_handling_and_dependency_injection.rs | 8 +++++++- examples/form.rs | 8 +++++++- examples/hello_world.rs | 8 +++++++- examples/key_value_store.rs | 8 +++++++- examples/multipart_form.rs | 8 +++++++- examples/sessions.rs | 8 +++++++- examples/sse.rs | 8 +++++++- examples/static_file_server.rs | 8 +++++++- examples/templates.rs | 8 +++++++- examples/testing.rs | 8 +++++++- examples/tls_rustls.rs | 8 +++++++- examples/todos.rs | 8 +++++++- examples/tokio_postgres.rs | 8 +++++++- examples/unix_domain_socket.rs | 8 +++++++- examples/versioning.rs | 8 +++++++- examples/websocket.rs | 10 ++++++++-- 17 files changed, 120 insertions(+), 18 deletions(-) diff --git a/examples/404.rs b/examples/404.rs index dd1e36b8..b16b3293 100644 --- a/examples/404.rs +++ b/examples/404.rs @@ -14,7 +14,13 @@ use tower::util::MapResponseLayer; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); // 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 d493e144..dffc03f8 100644 --- a/examples/error_handling_and_dependency_injection.rs +++ b/examples/error_handling_and_dependency_injection.rs @@ -24,7 +24,13 @@ use uuid::Uuid; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); // 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 af5b694f..f7fa650a 100644 --- a/examples/form.rs +++ b/examples/form.rs @@ -10,7 +10,13 @@ use std::net::SocketAddr; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); // 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 d8bbb434..fa53e9d0 100644 --- a/examples/hello_world.rs +++ b/examples/hello_world.rs @@ -9,7 +9,13 @@ use std::net::SocketAddr; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); // 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 0bd01ac2..9d00492b 100644 --- a/examples/key_value_store.rs +++ b/examples/key_value_store.rs @@ -31,7 +31,13 @@ use tower_http::{ #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); // Build our application by composing routes let app = route( diff --git a/examples/multipart_form.rs b/examples/multipart_form.rs index f3370355..59f6466a 100644 --- a/examples/multipart_form.rs +++ b/examples/multipart_form.rs @@ -12,7 +12,13 @@ use std::net::SocketAddr; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); // 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 ec830def..21aaaa67 100644 --- a/examples/sessions.rs +++ b/examples/sessions.rs @@ -20,7 +20,13 @@ use uuid::Uuid; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); // `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 0f11d6b6..a49593c9 100644 --- a/examples/sse.rs +++ b/examples/sse.rs @@ -13,7 +13,13 @@ use tower_http::{services::ServeDir, trace::TraceLayer}; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); // build our application with a route let app = nest( diff --git a/examples/static_file_server.rs b/examples/static_file_server.rs index e2ea8453..8bfe35e6 100644 --- a/examples/static_file_server.rs +++ b/examples/static_file_server.rs @@ -11,7 +11,13 @@ use tower_http::{services::ServeDir, trace::TraceLayer}; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); let app = nest( "/static", diff --git a/examples/templates.rs b/examples/templates.rs index 3cbbf30f..1a3753ce 100644 --- a/examples/templates.rs +++ b/examples/templates.rs @@ -11,7 +11,13 @@ use std::net::SocketAddr; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); // build our application with some routes let app = route("/greet/:name", get(greet)); diff --git a/examples/testing.rs b/examples/testing.rs index c67265ac..aa4505fc 100644 --- a/examples/testing.rs +++ b/examples/testing.rs @@ -9,7 +9,13 @@ use tower_http::trace::TraceLayer; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); let addr = std::net::SocketAddr::from(([127, 0, 0, 1], 3000)); diff --git a/examples/tls_rustls.rs b/examples/tls_rustls.rs index fa36ccee..ca570028 100644 --- a/examples/tls_rustls.rs +++ b/examples/tls_rustls.rs @@ -17,7 +17,13 @@ use tokio_rustls::{ #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); let rustls_config = rustls_server_config( "examples/self_signed_certs/key.pem", diff --git a/examples/todos.rs b/examples/todos.rs index 4de462a4..ef300af3 100644 --- a/examples/todos.rs +++ b/examples/todos.rs @@ -34,7 +34,13 @@ use uuid::Uuid; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); let db = Db::default(); diff --git a/examples/tokio_postgres.rs b/examples/tokio_postgres.rs index 69a2b77f..8b196234 100644 --- a/examples/tokio_postgres.rs +++ b/examples/tokio_postgres.rs @@ -13,7 +13,13 @@ use tokio_postgres::NoTls; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); // setup connection pool let manager = diff --git a/examples/unix_domain_socket.rs b/examples/unix_domain_socket.rs index ee4cb975..3882f520 100644 --- a/examples/unix_domain_socket.rs +++ b/examples/unix_domain_socket.rs @@ -36,7 +36,13 @@ fn main() { #[cfg(unix)] #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); let path = PathBuf::from("/tmp/axum/helloworld"); diff --git a/examples/versioning.rs b/examples/versioning.rs index cece3ca2..ef1e88ee 100644 --- a/examples/versioning.rs +++ b/examples/versioning.rs @@ -16,7 +16,13 @@ use std::net::SocketAddr; #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); // build our application with some routes let app = route("/:version/foo", get(handler)); diff --git a/examples/websocket.rs b/examples/websocket.rs index 09d3e045..c80c6da3 100644 --- a/examples/websocket.rs +++ b/examples/websocket.rs @@ -3,7 +3,7 @@ //! Run with //! //! ```not_rust -//! RUST_LOG=tower_http=debug,key_value_store=trace cargo run --features=ws,headers --example websocket +//! cargo run --features=ws,headers --example websocket //! ``` use axum::{ @@ -22,7 +22,13 @@ use tower_http::{ #[tokio::main] async fn main() { - tracing_subscriber::fmt::init(); + // Set the RUST_LOG, if it hasn't been explicitly defined + 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(); // build our application with some routes let app = nest(