Skip to content

fix(desktop): attribute graceful exit requests #2202

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

Open
BradGroux wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(desktop): attribute graceful exit requests #2202

Show file tree
Hide file tree
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
31 changes: 24 additions & 7 deletions apps/desktop/src-tauri/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,20 @@ const APP_MENU_QUIT_ID: &str = "app_quit";
#[cfg(target_os = "macos")]
static MACOS_NATIVE_TERMINATE_APP: std::sync::OnceLock<AppHandle> = std::sync::OnceLock::new();

#[derive(Debug, Clone, Copy)]
pub(crate) enum AppExitSource {
#[cfg(target_os = "macos")]
AppMenu,
#[cfg(target_os = "macos")]
MacOsNativeTermination,
Runtime,
#[cfg(unix)]
SigHup,
#[cfg(unix)]
SigTerm,
TrayMenu,
}

async fn await_exit_step<T, E, F>(name: &'static str, timeout: Duration, fut: F) -> Option<T>
where
E: std::fmt::Display,
Expand Down Expand Up @@ -671,7 +685,7 @@ unsafe extern "C" fn macos_application_should_terminate(
if let Some(app) = MACOS_NATIVE_TERMINATE_APP.get() {
let app = app.clone();
tokio::spawn(async move {
request_app_exit(app).await;
request_app_exit(app, AppExitSource::MacOsNativeTermination).await;
});
} else {
warn!("macOS native termination requested before app exit handler was installed");
Expand Down Expand Up @@ -3002,7 +3016,8 @@ fn restart_app(app: AppHandle) -> Result<(), String> {
}
}

pub async fn request_app_exit(app: AppHandle) {
pub(crate) async fn request_app_exit(app: AppHandle, source: AppExitSource) {
info!(?source, "Starting app exit request");
let Some(exit_state) = app.try_state::<AppExitState>() else {
show_exit_blocked(&app, ExitBlocked::StateUnavailable);
return;
Expand Down Expand Up @@ -6182,7 +6197,7 @@ pub async fn run(recording_logging_handle: LoggingHandle, logs_dir: PathBuf) {
if event.id() == APP_MENU_QUIT_ID {
let app = app.clone();
tokio::spawn(async move {
request_app_exit(app).await;
request_app_exit(app, AppExitSource::AppMenu).await;
});
}
})
Expand Down Expand Up @@ -6323,21 +6338,23 @@ pub async fn run(recording_logging_handle: LoggingHandle, logs_dir: PathBuf) {
return;
};
loop {
tokio::select! {
let source = tokio::select! {
signal = term.recv() => {
if signal.is_none() {
return;
}
tracing::info!("Received SIGTERM; requesting graceful shutdown");
AppExitSource::SigTerm
}
signal = hup.recv() => {
if signal.is_none() {
return;
}
tracing::info!("Received SIGHUP; requesting graceful shutdown");
AppExitSource::SigHup
}
}
request_app_exit(app_for_signal.clone()).await;
};
request_app_exit(app_for_signal.clone(), source).await;
if app_is_exiting(&app_for_signal) {
return;
}
Expand Down Expand Up @@ -7294,7 +7311,7 @@ fn handle_run_event(_handle: &AppHandle, event: tauri::RunEvent) {
ExitRequestDecision::StartCleanup => {
let handle = _handle.clone();
spawn_on_runtime(async move {
request_app_exit(handle).await;
request_app_exit(handle, AppExitSource::Runtime).await;
});
}
ExitRequestDecision::AlreadyExiting => {}
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src-tauri/src/tray.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ pub fn create_tray(app: &AppHandle) -> tauri::Result<()> {
Ok(TrayItem::Quit) => {
let app = app.clone();
tokio::spawn(async move {
crate::request_app_exit(app).await;
crate::request_app_exit(app, crate::AppExitSource::TrayMenu).await;
});
}
Ok(TrayItem::PreviousItem(path)) => {
Expand Down