move signal handling out to main

Signed-off-by: Jason Volk <jason@zemos.net>

src/main/main.rs

@@ -6,9 +6,10 @@ extern crate conduit_core as conduit;
 
 use std::{cmp, sync::Arc, time::Duration};
 
-use conduit::{debug_info, error, utils::available_parallelism, Error, Result};
+use conduit::{debug_error, debug_info, error, utils::available_parallelism, warn, Error, Result};
 use server::Server;
-use tokio::runtime;
+use tokio::{runtime, signal};
+use tracing::debug;
 
 const WORKER_NAME: &str = "conduwuit:worker";
 const WORKER_MIN: usize = 2;
@@ -26,6 +27,7 @@ fn main() -> Result<(), Error> {
 		.expect("built runtime");
 
 	let server: Arc<Server> = Server::build(args, Some(runtime.handle()))?;
+	runtime.spawn(signal(server.clone()));
 	runtime.block_on(async_main(&server))?;
 
 	// explicit drop here to trace thread and tls dtors
@@ -94,3 +96,34 @@ async fn async_main(server: &Arc<Server>) -> Result<(), Error> {
 	debug_info!("Exit runtime");
 	Ok(())
 }
+
+#[tracing::instrument(skip_all)]
+async fn signal(server: Arc<Server>) {
+	let (mut term, mut quit);
+	#[cfg(unix)]
+	{
+		use signal::unix;
+		quit = unix::signal(unix::SignalKind::quit()).expect("SIGQUIT handler");
+		term = unix::signal(unix::SignalKind::terminate()).expect("SIGTERM handler");
+	};
+
+	loop {
+		debug!("Installed signal handlers");
+		let sig: &'static str;
+		#[cfg(unix)]
+		tokio::select! {
+			_ = term.recv() => { sig = "SIGTERM"; },
+			_ = quit.recv() => { sig = "Ctrl+\\"; },
+			_ = signal::ctrl_c() => { sig = "Ctrl+C"; },
+		}
+		#[cfg(not(unix))]
+		tokio::select! {
+			_ = signal::ctrl_c() => { sig = "Ctrl+C"; },
+		}
+
+		warn!("Received signal {}", sig);
+		if let Err(e) = server.server.signal.send(sig) {
+			debug_error!("signal channel: {e}");
+		}
+	}
+}