From bd630644ca015fb2c94a25f2639e15375afa19f9 Mon Sep 17 00:00:00 2001 From: cpprian Date: Fri, 2 Aug 2024 16:35:44 +0200 Subject: [PATCH 1/3] set tower_http::trace log level by DEFGUARD_LOG_LEVEL --- src/bin/defguard.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/defguard.rs b/src/bin/defguard.rs index 2e1d9e64f9..563340394b 100644 --- a/src/bin/defguard.rs +++ b/src/bin/defguard.rs @@ -36,8 +36,8 @@ async fn main() -> Result<(), anyhow::Error> { .with( tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| { format!( - "defguard={},tower_http=info,axum::rejection=trace", - config.log_level + "defguard={},tower_http={},axum::rejection=trace", + config.log_level, config.log_level ) .into() }), From dcbd2b7122f14bdb97601c7d76709e8c249a21ab Mon Sep 17 00:00:00 2001 From: cpprian Date: Fri, 2 Aug 2024 17:24:21 +0200 Subject: [PATCH 2/3] set all log events by DEFGUARD_LOG_LEVEL --- .env | 4 ++-- src/bin/defguard.rs | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 60c27c65ab..a2347d0204 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ DEFGUARD_AUTH_SECRET=defguard-auth-secret DEFGUARD_GATEWAY_SECRET=defguard-gateway-secret DEFGUARD_YUBIBRIDGE_SECRET=defguard-yubibridge-secret -DEFGUARD_SECRET_KEY=defguard-secret-key +DEFGUARD_SECRET_KEY=mmA43VXekWwEBJ/ofXltmYdXzyYW5ZKffaqoZ3u49Ti8Fsstp1ABsrt/LDvUDXD/ DEFGUARD_URL=http://localhost:8000 # How long auth session lives in seconds DEFGUARD_AUTH_SESSION_LIFETIME=604800 @@ -13,7 +13,7 @@ DEFGUARD_DEFAULT_ADMIN_PASSWORD=pass123 ### Proxy configuration ### # Optional. URL of proxy gRPC server -# DEFGUARD_PROXY_URL=http://localhost:50051 +DEFGUARD_PROXY_URL=http://localhost:50051 ### LDAP configuration ### DEFGUARD_LDAP_URL=ldap://localhost:389 diff --git a/src/bin/defguard.rs b/src/bin/defguard.rs index 563340394b..97e65919be 100644 --- a/src/bin/defguard.rs +++ b/src/bin/defguard.rs @@ -34,13 +34,8 @@ async fn main() -> Result<(), anyhow::Error> { // initialize tracing tracing_subscriber::registry() .with( - tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| { - format!( - "defguard={},tower_http={},axum::rejection=trace", - config.log_level, config.log_level - ) - .into() - }), + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| format!("{}", config.log_level).into()), ) .with(tracing_subscriber::fmt::layer()) .init(); From 934152869fd62da5728da3560cabcbee10996a6e Mon Sep 17 00:00:00 2001 From: cpprian Date: Fri, 2 Aug 2024 17:25:42 +0200 Subject: [PATCH 3/3] undo .env values --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index a2347d0204..60c27c65ab 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ DEFGUARD_AUTH_SECRET=defguard-auth-secret DEFGUARD_GATEWAY_SECRET=defguard-gateway-secret DEFGUARD_YUBIBRIDGE_SECRET=defguard-yubibridge-secret -DEFGUARD_SECRET_KEY=mmA43VXekWwEBJ/ofXltmYdXzyYW5ZKffaqoZ3u49Ti8Fsstp1ABsrt/LDvUDXD/ +DEFGUARD_SECRET_KEY=defguard-secret-key DEFGUARD_URL=http://localhost:8000 # How long auth session lives in seconds DEFGUARD_AUTH_SESSION_LIFETIME=604800 @@ -13,7 +13,7 @@ DEFGUARD_DEFAULT_ADMIN_PASSWORD=pass123 ### Proxy configuration ### # Optional. URL of proxy gRPC server -DEFGUARD_PROXY_URL=http://localhost:50051 +# DEFGUARD_PROXY_URL=http://localhost:50051 ### LDAP configuration ### DEFGUARD_LDAP_URL=ldap://localhost:389