From c5b94be5b8d1816c3c03f4a7c15a702b7b8e5215 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Mon, 30 Dec 2024 17:01:27 +0000 Subject: [PATCH] remove dev_release_log_level cfg Signed-off-by: Jason Volk --- src/admin/Cargo.toml | 1 - src/api/Cargo.toml | 1 - src/core/Cargo.toml | 1 - src/core/debug.rs | 7 +------ src/database/Cargo.toml | 1 - src/main/Cargo.toml | 8 -------- src/router/Cargo.toml | 1 - src/service/Cargo.toml | 1 - 8 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/admin/Cargo.toml b/src/admin/Cargo.toml index 3f8fbf79..ca865969 100644 --- a/src/admin/Cargo.toml +++ b/src/admin/Cargo.toml @@ -17,7 +17,6 @@ crate-type = [ ] [features] -#dev_release_log_level = [] release_max_log_level = [ "tracing/max_level_trace", "tracing/release_max_level_info", diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml index f3a84664..1bc73624 100644 --- a/src/api/Cargo.toml +++ b/src/api/Cargo.toml @@ -18,7 +18,6 @@ crate-type = [ [features] element_hacks = [] -#dev_release_log_level = [] release_max_log_level = [ "tracing/max_level_trace", "tracing/release_max_level_info", diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index 2873a05d..49874c9c 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -17,7 +17,6 @@ crate-type = [ ] [features] -#dev_release_log_level = [] release_max_log_level = [ "tracing/max_level_trace", "tracing/release_max_level_info", diff --git a/src/core/debug.rs b/src/core/debug.rs index c904f23c..aebfc833 100644 --- a/src/core/debug.rs +++ b/src/core/debug.rs @@ -10,9 +10,6 @@ pub use crate::{result::DebugInspect, utils::debug::*}; /// Log event at given level in debug-mode (when debug-assertions are enabled). /// In release-mode it becomes DEBUG level, and possibly subject to elision. -/// -/// Release-mode can be simulated in debug-mode builds by enabling the feature -/// 'dev_release_log_level'. #[macro_export] macro_rules! debug_event { ( $level:expr, $($x:tt)+ ) => { @@ -98,6 +95,4 @@ pub fn type_name() -> &'static str { std::any::type_name::() } #[must_use] #[inline] -pub const fn logging() -> bool { - cfg!(debug_assertions) && cfg!(not(feature = "dev_release_log_level")) -} +pub const fn logging() -> bool { cfg!(debug_assertions) } diff --git a/src/database/Cargo.toml b/src/database/Cargo.toml index efd18a1a..09eedaf4 100644 --- a/src/database/Cargo.toml +++ b/src/database/Cargo.toml @@ -17,7 +17,6 @@ crate-type = [ ] [features] -#dev_release_log_level = [] release_max_log_level = [ "tracing/max_level_trace", "tracing/release_max_level_info", diff --git a/src/main/Cargo.toml b/src/main/Cargo.toml index eeb6f2bc..a6421b34 100644 --- a/src/main/Cargo.toml +++ b/src/main/Cargo.toml @@ -55,14 +55,6 @@ brotli_compression = [ console = [ "conduwuit-service/console", ] -#dev_release_log_level = [ -# "conduwuit-admin/dev_release_log_level", -# "conduwuit-api/dev_release_log_level", -# "conduwuit-core/dev_release_log_level", -# "conduwuit-database/dev_release_log_level", -# "conduwuit-router/dev_release_log_level", -# "conduwuit-service/dev_release_log_level", -#] direct_tls = [ "conduwuit-router/direct_tls" ] diff --git a/src/router/Cargo.toml b/src/router/Cargo.toml index 1b2c248e..1623590b 100644 --- a/src/router/Cargo.toml +++ b/src/router/Cargo.toml @@ -17,7 +17,6 @@ crate-type = [ ] [features] -#dev_release_log_level = [] release_max_log_level = [ "tracing/max_level_trace", "tracing/release_max_level_info", diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index 85c4ead9..26f737ee 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -24,7 +24,6 @@ console = [ "dep:rustyline-async", "dep:termimad", ] -#dev_release_log_level = [] element_hacks = [] gzip_compression = [ "reqwest/gzip",