github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-06 11:35:45 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

Switched to explicit shutdown message instead of None

Browse Source
This commit is contained in:
Antonios Barotsis 2024-03-29 01:03:06 +01:00 committed by João Marcos
parent a3e5bac438
commit a14bbfc904
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/utils/logger.rs
View File

@ -46,6 +46,12 @@ pub fn warning(contents: String) {
}); });
} }
#[derive(Debug)]
enum Message {
FlushAndShutdown,
PrintMessage(PrintMessage),
}
/// Message object used for sending logs from worker threads to a logging thread via channels. /// Message object used for sending logs from worker threads to a logging thread via channels.
/// See <https://github.com/ouch-org/ouch/issues/643> /// See <https://github.com/ouch-org/ouch/issues/643>
#[derive(Debug)] #[derive(Debug)]
@ -96,8 +102,8 @@ mod logger_thread {
use super::*; use super::*;
type LogReceiver = mpsc::Receiver<Option<PrintMessage>>; type LogReceiver = mpsc::Receiver<Message>;
type LogSender = mpsc::Sender<Option<PrintMessage>>; type LogSender = mpsc::Sender<Message>;
static SENDER: OnceLock<LogSender> = OnceLock::new(); static SENDER: OnceLock<LogSender> = OnceLock::new();
@ -115,12 +121,16 @@ mod logger_thread {
#[track_caller] #[track_caller]
pub(super) fn send_log_message(msg: PrintMessage) { pub(super) fn send_log_message(msg: PrintMessage) {
send_message(Some(msg)); get_sender()
.send(Message::PrintMessage(msg))
.expect("Failed to send print message");
} }
#[track_caller] #[track_caller]
fn send_message(msg: Option<PrintMessage>) { fn send_shutdown_message() {
get_sender().send(msg).expect("Failed to send internal message"); get_sender()
.send(Message::FlushAndShutdown)
.expect("Failed to send shutdown message");
} }
pub struct LoggerThreadHandle { pub struct LoggerThreadHandle {
@ -131,7 +141,7 @@ mod logger_thread {
/// Tell logger to shutdown and waits till it does. /// Tell logger to shutdown and waits till it does.
pub fn shutdown_and_wait(self) { pub fn shutdown_and_wait(self) {
// Signal the shutdown // Signal the shutdown
send_message(None); send_shutdown_message();
// Wait for confirmation // Wait for confirmation
self.shutdown_barrier.wait(); self.shutdown_barrier.wait();
} }
@ -166,21 +176,21 @@ mod logger_thread {
Err(RecvTimeoutError::Disconnected) => unreachable!("sender is static"), Err(RecvTimeoutError::Disconnected) => unreachable!("sender is static"),
}; };
let is_shutdown_message = msg.is_none(); match msg {
Message::PrintMessage(msg) => {
// Append message to buffer
if let Some(msg) = msg.to_processed_message() {
buffer.push(msg);
}
// Append message to buffer if buffer.len() == buffer.capacity() {
if let Some(msg) = msg.as_ref().and_then(PrintMessage::to_processed_message) { flush_logs_to_stderr(&mut buffer);
buffer.push(msg); }
} }
Message::FlushAndShutdown => {
let should_flush = buffer.len() == buffer.capacity() || is_shutdown_message; flush_logs_to_stderr(&mut buffer);
break;
if should_flush { }
flush_logs_to_stderr(&mut buffer);
}
if is_shutdown_message {
break;
} }
} }