Skip to content
Merged
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
47 changes: 33 additions & 14 deletions crates/base/src/runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,22 @@ impl<C: LoadConfig> ServerRunner<C> {
mut server,
context,
} = self;

// Init the adapter server (e.g. create underlying HTTP server)
server.init(&context).await?;
log::info!("Draco successfully initialized.");

#[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::<()>();

match health_task {
Some(mut ht) => {
tokio::select! {
Expand All @@ -113,28 +124,36 @@ impl<C: LoadConfig> ServerRunner<C> {
server.shutdown(&context).await?;
}

// Ctrl+C / SIGINT
// Ctrl+C
_ = signal::ctrl_c() => {
log::info!("Ctrl+C/Exit signal received, shutting down adapter");
server.shutdown(&context).await?;
ht.abort();
}
_ = sigterm => {
log::info!("SIGTERM received, shutting down adapter");
server.shutdown(&context).await?;
ht.abort();
}
}
}

None => {
tokio::select! {
// Adapter server loop ends on its own
res = server.run(&context) => {
log::warn!("Adapter server finished");
res?;
}

// Ctrl+C / SIGINT
_ = signal::ctrl_c() => {
log::info!("Ctrl+C/Exit signal received, shutting down adapter");
server.shutdown(&context).await?;
}
// Adapter server loop ends on its own
res = server.run(&context) => {
log::warn!("Adapter server finished");
res?;
}

// Ctrl+C
_ = signal::ctrl_c() => {
log::info!("Ctrl+C/Exit signal received, shutting down adapter");
server.shutdown(&context).await?;
}
_ = sigterm => {
log::info!("SIGTERM received, shutting down adapter");
server.shutdown(&context).await?;
}
}
}
}
Expand Down