jimzah/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-27 11:42:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'shutdown-msg' into 'next'

Browse Source 
Log caught Ctrl+C or SIGTERM for operator feedback

See merge request famedly/conduit!319
This commit is contained in:
Timo Kösters 2022-04-01 08:49:28 +00:00
commit b11a3b80bc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@ -37,6 +37,7 @@ use tower_http::{
trace::TraceLayer, trace::TraceLayer,
ServiceBuilderExt as _, ServiceBuilderExt as _,
}; };
use tracing::warn;
use tracing_subscriber::{prelude::*, EnvFilter}; use tracing_subscriber::{prelude::*, EnvFilter};
pub use conduit::*; // Re-export everything from the library crate pub use conduit::*; // Re-export everything from the library crate
@ -346,11 +347,14 @@ async fn shutdown_signal(handle: ServerHandle) {
#[cfg(not(unix))] #[cfg(not(unix))]
let terminate = std::future::pending::<()>(); let terminate = std::future::pending::<()>();
let sig: &str;
tokio::select! { tokio::select! {
_ = ctrl_c => {}, _ = ctrl_c => { sig = "Ctrl+C"; },
_ = terminate => {}, _ = terminate => { sig = "SIGTERM"; },
} }
warn!("Received {}, shutting down...", sig);
handle.graceful_shutdown(Some(Duration::from_secs(30))); handle.graceful_shutdown(Some(Duration::from_secs(30)));
} }