blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-07-01 03:55:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(blahd): impl graceful shutdown

Browse source
This commit is contained in:
oxalica 2024-09-22 05:16:10 -04:00
parent 5143e30fbe
commit 7384888128
4 changed files with 33 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
blahd/Cargo.toml
View file

@ -30,7 +30,7 @@ serde_jcs = "0.1"
serde_json = "1"
serde_urlencoded = "0.7.1"
sha2 = "0.10"
tokio = { version = "1", features = ["macros", "rt-multi-thread", "sync", "time"] }
tokio = { version = "1", features = ["macros", "rt-multi-thread", "signal", "sync", "time"] }
tokio-stream = { version = "0.1", features = ["sync"] }
toml = "0.8"
tower-http = { version = "0.5", features = ["cors", "limit"] }

16
blahd/src/bin/blahd.rs
View file

@ -1,3 +1,4 @@
use std::future::IntoFuture;
use std::os::fd::{FromRawFd, OwnedFd};
use std::path::PathBuf;
use std::sync::Arc;
@ -5,6 +6,7 @@ use std::sync::Arc;
use anyhow::{anyhow, bail, Context, Result};
use blahd::config::{Config, ListenConfig};
use blahd::{AppState, Database};
use tokio::signal::unix::{signal, SignalKind};
/// Blah Chat Server
#[derive(Debug, clap::Parser)]
@ -94,10 +96,16 @@ async fn main_serve(db: Database, config: Config) -> Result<()> {
tracing::info!("listening on {listener_display}");
let router = blahd::router(Arc::new(st));
let _ = sd_notify::notify(true, &[sd_notify::NotifyState::Ready]);
axum::serve(listener, router)
.await
.context("failed to serve")?;
let mut sigterm = signal(SignalKind::terminate()).context("failed to listen on SIGTERM")?;
let service = axum::serve(listener, router)
.with_graceful_shutdown(async move {
sigterm.recv().await;
tracing::info!("received SIGTERM, shutting down gracefully");
})
.into_future();
let _ = sd_notify::notify(true, &[sd_notify::NotifyState::Ready]);
service.await.context("failed to serve")?;
Ok(())
}

18
blahd/tests/socket_activate.rs
View file

@ -104,7 +104,7 @@ fn socket_activate(#[case] unix_socket: bool) {
}
ForkResult::Parent { child } => {
let guard = scopeguard::guard((), |()| {
let _ = kill(child, Signal::SIGKILL);
let _ = kill(child, Signal::SIGTERM);
});
if !unix_socket {
@ -130,15 +130,17 @@ fn socket_activate(#[case] unix_socket: bool) {
}
let st = waitpid(child, None).unwrap();
if unix_socket {
let expect_exit_code = if unix_socket {
// Fail with unsupported error.
assert!(matches!(st, WaitStatus::Exited(_, 1)));
1
} else {
assert!(
matches!(st, WaitStatus::Signaled(_, Signal::SIGKILL, _)),
"unexpected exit status {st:?}",
);
}
// Graceful shutdown.
0
};
assert!(
matches!(st, WaitStatus::Exited(_, code) if code == expect_exit_code),
"unexpected exit status {st:?}",
);
}
}
}