Fix panic messages being invisible in tui mode (#2226)

* Fix panic messages being invisible in tui mode

Currently when a panic happens the message gets printed to the alternate screen which gets erased after the terminal is reset to raw mode in the TuiMetricsRenderer drop code.

That leaves users unable to see the panic message (issue #2062).

This commit changes TuiMetricsRenderer to reset the terminal first during a panic and then running the panic handler.

* Use PanicInfo to support Rust version < 1.82
This commit is contained in:
Paul Wagener 2024-09-06 22:22:00 +02:00 committed by GitHub
parent a567c6e888
commit 0f191e67aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 3 deletions

View File

@ -7,6 +7,8 @@ use crossterm::{
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen}, terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
}; };
use ratatui::{prelude::*, Terminal}; use ratatui::{prelude::*, Terminal};
use std::panic::{set_hook, take_hook};
use std::sync::Arc;
use std::{ use std::{
error::Error, error::Error,
io::{self, Stdout}, io::{self, Stdout},
@ -23,6 +25,9 @@ pub(crate) type TerminalBackend = CrosstermBackend<Stdout>;
/// The current terminal frame. /// The current terminal frame.
pub(crate) type TerminalFrame<'a> = ratatui::Frame<'a>; pub(crate) type TerminalFrame<'a> = ratatui::Frame<'a>;
#[allow(deprecated)] // `PanicInfo` type is renamed to `PanicHookInfo` in Rust 1.82
type PanicHook = Box<dyn Fn(&std::panic::PanicInfo<'_>) + 'static + Sync + Send>;
const MAX_REFRESH_RATE_MILLIS: u64 = 100; const MAX_REFRESH_RATE_MILLIS: u64 = 100;
/// The terminal UI metrics renderer. /// The terminal UI metrics renderer.
@ -35,6 +40,7 @@ pub struct TuiMetricsRenderer {
status: StatusState, status: StatusState,
interuptor: TrainingInterrupter, interuptor: TrainingInterrupter,
popup: PopupState, popup: PopupState,
previous_panic_hook: Option<Arc<PanicHook>>,
} }
impl MetricsRenderer for TuiMetricsRenderer { impl MetricsRenderer for TuiMetricsRenderer {
@ -85,6 +91,18 @@ impl TuiMetricsRenderer {
enable_raw_mode().unwrap(); enable_raw_mode().unwrap();
let terminal = Terminal::new(CrosstermBackend::new(stdout)).unwrap(); let terminal = Terminal::new(CrosstermBackend::new(stdout)).unwrap();
// Reset the terminal to raw mode on panic before running the panic handler
// This prevents that the panic message is not visible for the user.
let previous_panic_hook = Arc::new(take_hook());
set_hook(Box::new({
let previous_panic_hook = previous_panic_hook.clone();
move |panic_info| {
let _ = disable_raw_mode();
let _ = execute!(io::stdout(), LeaveAlternateScreen);
previous_panic_hook(panic_info);
}
}));
Self { Self {
terminal, terminal,
last_update: Instant::now(), last_update: Instant::now(),
@ -94,6 +112,7 @@ impl TuiMetricsRenderer {
status: StatusState::default(), status: StatusState::default(),
interuptor, interuptor,
popup: PopupState::Empty, popup: PopupState::Empty,
previous_panic_hook: Some(previous_panic_hook),
} }
} }
@ -205,8 +224,20 @@ impl CallbackFn for PopupCancel {
impl Drop for TuiMetricsRenderer { impl Drop for TuiMetricsRenderer {
fn drop(&mut self) { fn drop(&mut self) {
// Reset the terminal back to raw mode. This can be skipped during
// panicking because the panic hook has already reset the terminal
if !std::thread::panicking() {
disable_raw_mode().ok(); disable_raw_mode().ok();
execute!(self.terminal.backend_mut(), LeaveAlternateScreen).unwrap(); execute!(self.terminal.backend_mut(), LeaveAlternateScreen).unwrap();
self.terminal.show_cursor().ok(); self.terminal.show_cursor().ok();
// Reinstall the previous panic hook
let _ = take_hook();
if let Some(previous_panic_hook) =
Arc::into_inner(self.previous_panic_hook.take().unwrap())
{
set_hook(previous_panic_hook);
}
}
} }
} }