feat(smol): use async_signal instead of signal_hook_async_std

smol/Cargo.toml

@@ -23,7 +23,7 @@ trillium-server-common = { path = "../server-common", version = "0.5.2" }
 
 [target.'cfg(unix)'.dependencies]
 signal-hook = "0.3.17"
-signal-hook-async-std = "0.2.2"
+async-signal = "0.2.8"
 
 [dev-dependencies]
 env_logger = "0.11.0"

smol/src/server/unix.rs

@@ -38,15 +38,13 @@ impl Server for SmolServer {
 
     fn handle_signals(stop: Stopper) -> Pin<Box<dyn Future<Output = ()> + Send + 'static>> {
         Box::pin(async move {
-            use signal_hook::consts::signal::*;
-            use signal_hook_async_std::Signals;
-
-            let signals = Signals::new([SIGINT, SIGTERM, SIGQUIT]).unwrap();
-            let mut signals = signals.fuse();
-            while signals.next().await.is_some() {
+            use async_signal::{Signal, Signals};
+            let mut signals = Signals::new([Signal::Int, Signal::Term, Signal::Quit]).unwrap();
+            while let Some(signal) = signals.next().await {
                 if stop.is_stopped() {
-                    eprintln!("\nSecond interrupt, shutting down harshly");
-                    std::process::exit(1);
+                    eprintln!("\nSecond signal ({signal:?}), shutting down harshly");
+                    signal_hook::low_level::emulate_default_handler(signal.unwrap() as i32)
+                        .unwrap();
                 } else {
                     println!("\nShutting down gracefully.\nControl-C again to force.");
                     stop.stop();