Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add graceful shutdown on SIGTERM #1014

Merged
merged 2 commits into from
May 30, 2023
Merged

Add graceful shutdown on SIGTERM #1014

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
270fe45
Add graceful shutdown on SIGTERM
InCogNiTo124 May 29, 2023
55dccf8
Fix linter
InCogNiTo124 May 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 17 additions & 0 deletions atuin-server/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ use eyre::{Context, Result};

use crate::settings::Settings;

use tokio::signal;

pub mod auth;
pub mod calendar;
pub mod database;
Expand All @@ -17,6 +19,20 @@ pub mod router;
pub mod settings;
pub mod utils;

async fn shutdown_signal() {
let terminate = async {
signal::unix::signal(signal::unix::SignalKind::terminate())
.expect("failed to register signal handler")
.recv()
.await;
};

tokio::select! {
_ = terminate => (),
}
eprintln!("Shutting down gracefully...");
}

pub async fn launch(settings: Settings, host: String, port: u16) -> Result<()> {
let host = host.parse::<IpAddr>()?;

Expand All @@ -28,6 +44,7 @@ pub async fn launch(settings: Settings, host: String, port: u16) -> Result<()> {

Server::bind(&SocketAddr::new(host, port))
.serve(r.into_make_service())
.with_graceful_shutdown(shutdown_signal())
.await?;

Ok(())
Expand Down