From 6729dd060ba8afbf11757b13608cfe6f78ffe693 Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Mon, 12 Oct 2026 17:22:39 +0200 Subject: [PATCH] Added graceful shutdown. --- server/src/main.rs | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/server/src/main.rs b/server/src/main.rs index ddf5813..fcffd5a 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -33,7 +33,7 @@ async fn main() -> anyhow::Result<()> { .await .context("failed to run database migrations")?; - let state = state::AppState::new(pool); + let state = state::AppState::new(pool.clone()); let router = routes::create_router(state); let host = env::var("HOST").context("HOST must be set")?; @@ -45,8 +45,44 @@ async fn main() -> anyhow::Result<()> { tracing::info!(%addr, "starting server"); axum::serve(listener, router.into_make_service()) + .with_graceful_shutdown(shutdown_signal()) .await .context("server stopped unexpectedly")?; + pool.close().await; + + tracing::info!("server shut down gracefully"); Ok(()) } + +async fn shutdown_signal() { + let ctrl_c = async { + if let Err(error) = tokio::signal::ctrl_c().await { + tracing::error!(%error, "failed to install Ctrl+C handler"); + std::future::pending::<()>().await; + } + }; + + #[cfg(unix)] + let terminate = async { + match tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate()) { + Ok(mut signal) => { + signal.recv().await; + } + Err(error) => { + tracing::error!(%error, "failed to install SIGTERM handler"); + std::future::pending::<()>().await; + } + } + }; + + #[cfg(not(unix))] + let terminate = std::future::pending::<()>(); + + tokio::select! { + _ = ctrl_c => {}, + _ = terminate => {}, + } + + tracing::info!("shutdown signal received, draining connections"); +}