From 5139f8ea119704f8e5fffd926de11fb6b2428606 Mon Sep 17 00:00:00 2001 From: Awiteb Date: Thu, 8 May 2025 12:27:13 +0000 Subject: [PATCH] chore: Improve logging Signed-off-by: Awiteb --- src/main.rs | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 5213669..cc4a410 100644 --- a/src/main.rs +++ b/src/main.rs @@ -21,13 +21,22 @@ mod error; /// Nostr utils module mod nostr_utils; -use std::process::ExitCode; +use std::{ + process::ExitCode, + sync::atomic::{AtomicBool, Ordering}, +}; use clap::Parser; use clap_verbosity_flag::Verbosity; +use tracing::Level; +use tracing_subscriber::{Layer, filter, layer::SubscriberExt}; use self::cli::Cli; +/// Whether the editor is currently open. Prevents logging while the editor is +/// open. +static EDITOR_OPEN: AtomicBool = AtomicBool::new(false); + /// Configures the logging level based on the provided verbosity. /// /// When verbosity is set to TRACE, includes file and line numbers in logs. @@ -36,12 +45,17 @@ fn set_log_level(verbosity: Verbosity) { .tracing_level() .is_some_and(|l| l == tracing::Level::TRACE); - let subscriber = tracing_subscriber::fmt() + let logs_filter = filter::dynamic_filter_fn(move |m, _| { + // Disable all logs while editor is open + verbosity.tracing_level().unwrap_or(Level::ERROR) >= *m.level() + && !EDITOR_OPEN.load(Ordering::Relaxed) + }); + + let logs_layer = tracing_subscriber::fmt::layer() .with_file(is_trace) .with_line_number(is_trace) - .without_time() - .with_max_level(verbosity) - .finish(); + .without_time(); + let subscriber = tracing_subscriber::registry().with(logs_layer.with_filter(logs_filter)); tracing::subscriber::set_global_default(subscriber).ok(); }