leyoda/cosmic-session
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improv(main): use tokio signals for SIGINT and SIGTERM

Browse source 
This allows removing async-signals and libc.
This commit is contained in:
Vukašin Vojinović 2026-04-25 17:32:53 +02:00 • committed by Jeremy Soller
parent 9a55864e81
commit 56f0115952
3 changed files with 161 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main.rs
View file

@ -9,10 +9,8 @@ mod process;
mod service;
mod systemd;
use async_signals::Signals;
use color_eyre::{Result, eyre::WrapErr};
use cosmic_notifications_util::{DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD};
use futures_util::StreamExt;
#[cfg(feature = "autostart")]
use itertools::Itertools;
use launch_pad::{ProcessManager, process::Process};
@ -27,6 +25,7 @@ use std::{borrow::Cow, env, os::fd::AsRawFd, sync::Arc};
#[cfg(feature = "systemd")]
use systemd::{get_systemd_env, is_systemd_used, spawn_scope};
use tokio::{
signal::unix::{SignalKind, signal},
sync::{
Mutex,
mpsc::{Receiver, Sender},
@ -457,7 +456,8 @@ async fn start(
info!("started {} programs", dedupe.len());
}
let mut signals = Signals::new(vec![libc::SIGTERM, libc::SIGINT]).unwrap();
let mut sigterm = signal(SignalKind::terminate()).expect("Failed to bind SIGTERM handler");
let mut sigint = signal(SignalKind::interrupt()).expect("Failed to bind SIGINT handler");
let mut status = Status::Exited;
let session_dbus_rx_next = session_rx.recv();
tokio::select! {
@ -475,12 +475,11 @@ async fn start(
}
}
},
signal = signals.next() => match signal {
Some(libc::SIGTERM | libc::SIGINT) => {
info!("EXITING: received request to terminate");
}
Some(signal) => unreachable!("EXITING: received unhandled signal {}", signal),
None => {},
_ = sigterm.recv() => {
info!("EXITING: received SIGTERM request to terminate");
},
_ = sigint.recv() => {
info!("EXITING: received SIGINT request to terminate");
}
}