From 1be7fd9247593ae755474d491cc1589e81830af8 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Mon, 8 Sep 2025 03:51:05 +0000 Subject: [PATCH] Fix cfg condition for debug logging (996a5488bee9) Signed-off-by: Jason Volk --- docker/bake.hcl | 4 ++-- src/core/debug.rs | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docker/bake.hcl b/docker/bake.hcl index 4afefc44..80c8afb7 100644 --- a/docker/bake.hcl +++ b/docker/bake.hcl @@ -32,9 +32,9 @@ cargo_feat_sets = { # Default features default = "brotli_compression,element_hacks,gzip_compression,io_uring,jemalloc,jemalloc_conf,media_thumbnail,release_max_log_level,systemd,url_preview,zstd_compression" # All features sans release_max_log_level - logging = "blurhashing,brotli_compression,bzip2_compression,console,default,direct_tls,element_hacks,gzip_compression,hardened_malloc,io_uring,jemalloc,jemalloc_conf,jemalloc_prof,jemalloc_stats,ldap,lz4_compression,media_thumbnail,perf_measurements,sentry_telemetry,systemd,tokio_console,tuwunel_mods,url_preview,zstd_compression" + logging = "blurhashing,brotli_compression,bzip2_compression,console,direct_tls,element_hacks,gzip_compression,hardened_malloc,io_uring,jemalloc,jemalloc_conf,jemalloc_prof,jemalloc_stats,ldap,lz4_compression,media_thumbnail,perf_measurements,sentry_telemetry,systemd,tokio_console,tuwunel_mods,url_preview,zstd_compression" # All features - all = "blurhashing,brotli_compression,bzip2_compression,console,default,direct_tls,element_hacks,gzip_compression,hardened_malloc,io_uring,jemalloc,jemalloc_conf,jemalloc_prof,jemalloc_stats,ldap,lz4_compression,media_thumbnail,perf_measurements,release_max_log_level,sentry_telemetry,systemd,tokio_console,tuwunel_mods,url_preview,zstd_compression" + all = "blurhashing,brotli_compression,bzip2_compression,console,direct_tls,element_hacks,gzip_compression,hardened_malloc,io_uring,jemalloc,jemalloc_conf,jemalloc_prof,jemalloc_stats,ldap,lz4_compression,media_thumbnail,perf_measurements,release_max_log_level,sentry_telemetry,systemd,tokio_console,tuwunel_mods,url_preview,zstd_compression" } variable "cargo_features_always" { default = "direct_tls" diff --git a/src/core/debug.rs b/src/core/debug.rs index c17c7806..9e1a2e75 100644 --- a/src/core/debug.rs +++ b/src/core/debug.rs @@ -53,11 +53,7 @@ macro_rules! debug_info { } } -pub const INFO_SPAN_LEVEL: Level = if cfg!(debug_assertions) { - Level::INFO -} else { - Level::DEBUG -}; +pub const INFO_SPAN_LEVEL: Level = if logging() { Level::INFO } else { Level::DEBUG }; pub static DEBUGGER: LazyLock = LazyLock::new(|| env::var("_").unwrap_or_default().ends_with("gdb")); @@ -121,5 +117,7 @@ pub fn type_name() -> &'static str { std::any::type_name::() } #[must_use] #[inline] pub const fn logging() -> bool { - cfg!(debug_assertions) || cfg!(tuwunel_debug) || cfg!(not(feature = "release_max_log_level")) + cfg!(debug_assertions) + || cfg!(tuwunel_debug_logging) + || !cfg!(feature = "release_max_log_level") }