Skip to content

Use OnceLock for logging guard #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
multiplex55 merged 1 commit into from
Aug 25, 2025
Merged

Use OnceLock for logging guard #610

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/logging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use std::path::PathBuf;
use std::sync::OnceLock;
use tracing_appender::non_blocking::WorkerGuard;
use tracing_subscriber::{fmt, prelude::*, EnvFilter};

static mut LOG_GUARD: Option<WorkerGuard> = None;
static LOG_GUARD: OnceLock<WorkerGuard> = OnceLock::new();

/// Initialise logging. In debug builds the default level is `debug` while in
/// release builds it falls back to `info`. The level can be overridden via the
Expand All @@ -24,9 +25,7 @@ pub fn init(debug: bool, log_file: Option<PathBuf>) {
if let (Some(dir), Some(file)) = (path.parent(), path.file_name()) {
let file_appender = tracing_appender::rolling::never(dir, file);
let (nb, guard) = tracing_appender::non_blocking(file_appender);
unsafe {
LOG_GUARD = Some(guard);
}
let _ = LOG_GUARD.set(guard);
let file_layer = fmt::layer().with_ansi(false).with_writer(nb);
let _ = tracing_subscriber::registry()
.with(filter)
Expand Down
Loading