magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make shutdown grace periods configurable

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-02-02 10:43:02 +00:00
parent bd6d4bc58f
commit ffe3b0faf2
5 changed files with 39 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/router/request.rs
View file

@ -1,6 +1,7 @@
use std::{
fmt::Debug,
sync::{atomic::Ordering, Arc},
time::Duration,
};
use axum::{
@ -9,7 +10,9 @@ use axum::{
};
use conduwuit::{debug, debug_error, debug_warn, err, error, trace, Result};
use conduwuit_service::Services;
use futures::FutureExt;
use http::{Method, StatusCode, Uri};
use tokio::time::sleep;
use tracing::Span;
#[tracing::instrument(
@ -63,8 +66,14 @@ pub(crate) async fn handle(
let task = services.server.runtime().spawn(async move {
tokio::select! {
response = execute(&services_, req, next, parent) => response,
() = services_.server.until_shutdown() =>
StatusCode::SERVICE_UNAVAILABLE.into_response(),
response = services_.server.until_shutdown()
.then(|()| {
let timeout = services_.server.config.client_shutdown_timeout;
let timeout = Duration::from_secs(timeout);
sleep(timeout)
})
.map(|()| StatusCode::SERVICE_UNAVAILABLE)
.map(IntoResponse::into_response) => response,
}
});

3
src/router/run.rs
View file

@ -122,7 +122,8 @@ async fn handle_shutdown(server: Arc<Server>, tx: Sender<()>, handle: axum_serve
error!("failed sending shutdown transaction to channel: {e}");
}
let timeout = Duration::from_secs(36);
let timeout = server.config.client_shutdown_timeout;
let timeout = Duration::from_secs(timeout);
debug!(
?timeout,
handle_active = ?server.metrics.requests_handle_active.load(Ordering::Relaxed),