diff --git a/lore-base/src/log/mod.rs b/lore-base/src/log/mod.rs index 237bcfa..1b87ebf 100644 --- a/lore-base/src/log/mod.rs +++ b/lore-base/src/log/mod.rs @@ -79,19 +79,12 @@ pub fn dispatch_log(level: LoreLogLevel, location: &str, message: &str) { #[macro_export] macro_rules! lore_trace { - ($fmt:expr $(, $arg:expr)* $(,)?) => {{ - #[cfg(not(feature = "trace_log"))] - if false { - let _ = core::format_args!($fmt $(, $arg)*); - } - #[cfg(feature = "trace_log")] - if true { - $crate::lore_log_event!( - $crate::log::LoreLogLevel::Trace, - $fmt $(, $arg)* - ) - } - }}; + ($fmt:expr $(, $arg:expr)* $(,)?) => { + $crate::lore_log_event!( + $crate::log::LoreLogLevel::Trace, + $fmt $(, $arg)* + ) + }; } #[macro_export] diff --git a/lore-client/src/cli/client_main.rs b/lore-client/src/cli/client_main.rs index 5e2990c..d6373ca 100644 --- a/lore-client/src/cli/client_main.rs +++ b/lore-client/src/cli/client_main.rs @@ -41,7 +41,6 @@ pub fn client_main() -> ExitCode { cli.non_interactive, ); - lore::log::initialize(); lore::log::configure(&log_config); if let Some(max_threads) = cli.max_threads { diff --git a/lore/src/log.rs b/lore/src/log.rs index 5568ba7..76eb149 100644 --- a/lore/src/log.rs +++ b/lore/src/log.rs @@ -64,16 +64,18 @@ pub fn log_level() -> LoreLogLevel { pub fn configure(config: &LoreLogConfig) { initialize(); - if config.file == 0 { - return; - } - let mut config = config.clone(); if config.level == LoreLogLevel::None { config.level = LoreLogLevel::Info; } + lore_base::log::set_log_level(config.level); + + if config.file == 0 { + return; + } + let prefix = if !config.file_prefix.is_empty() { config.file_prefix.to_string() } else {