Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ code0-flow = { version = "0.0.44", features = ["flow_telemetry"] }
jsonwebtoken = { version = "11.0.0", features = ["rust_crypto"] }
log = "0.4.33"
serde = { version = "1.0.228", features = ["derive"] }
tokio = { version = "1.52.3", features = ["macros", "rt-multi-thread", "sync"] }
tokio = { version = "1.52.3", features = ["macros", "rt-multi-thread", "signal", "sync"] }
tokio-stream = "0.1.18"
tonic = "0.14.6"
tonic-health = "0.14.6"
Expand Down
28 changes: 27 additions & 1 deletion gateway/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,38 @@ async fn run(config: Config) -> anyhow::Result<()> {
}

log::info!("Sagittarius gateway listening on {}", address);
server_builder.serve(address).await?;
server_builder
.serve_with_shutdown(address, shutdown_signal())
.await?;
log::info!("Sagittarius gateway stopped");

Ok(())
}

/// Resolves once a Ctrl+C (SIGINT) or SIGTERM is received, so the caller can
/// pass it to `serve_with_shutdown` for a graceful stop.
async fn shutdown_signal() {
#[cfg(unix)]
let sigterm = async {
use tokio::signal::unix::{SignalKind, signal};

let mut term = signal(SignalKind::terminate()).expect("failed to install SIGTERM handler");
term.recv().await;
};

#[cfg(not(unix))]
let sigterm = std::future::pending::<()>();

tokio::select! {
_ = tokio::signal::ctrl_c() => {
log::info!("Ctrl+C/Exit signal received, shutting down");
}
_ = sigterm => {
log::info!("SIGTERM received, shutting down");
}
}
}

fn install_panic_logging() {
std::panic::set_hook(Box::new(move |panic_info| {
let message = if let Some(message) = panic_info.payload().downcast_ref::<&str>() {
Expand Down