Skip to content

Remove the custom SIGINT and SIGTERM handlers #6294

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

Open
isum wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −36
Open

Remove the custom SIGINT and SIGTERM handlers #6294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 30 additions & 36 deletions node/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fn main() {
async fn main_inner() {
env_logger::init();

let cancel_token = shutdown_token();
let cancel_token = CancellationToken::new();
let env_vars = Arc::new(EnvVars::from_env().unwrap());
let opt = opt::Opt::parse();

Expand Down Expand Up @@ -66,38 +66,32 @@ async fn main_inner() {
.await;
}

fn shutdown_token() -> CancellationToken {
use tokio::signal;

let cancel_token = CancellationToken::new();
let cancel_token_clone = cancel_token.clone();

async fn shutdown_signal_handler() {
let ctrl_c = async {
signal::ctrl_c().await.unwrap();
};

#[cfg(unix)]
let terminate = async {
signal::unix::signal(signal::unix::SignalKind::terminate())
.unwrap()
.recv()
.await;
};

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

tokio::select! {
_ = ctrl_c => {},
_ = terminate => {},
};
}

tokio::spawn(async move {
shutdown_signal_handler().await;
cancel_token_clone.cancel();
});

cancel_token
}
// TODO: Removed until all graph-node components are updated to handle the cancel signal.
// fn shutdown_token() -> CancellationToken {
// use tokio::signal;
// let cancel_token = CancellationToken::new();
// let cancel_token_clone = cancel_token.clone();
// async fn shutdown_signal_handler() {
// let ctrl_c = async {
// signal::ctrl_c().await.unwrap();
// };
// #[cfg(unix)]
// let terminate = async {
// signal::unix::signal(signal::unix::SignalKind::terminate())
// .unwrap()
// .recv()
// .await;
// };
// #[cfg(not(unix))]
// let terminate = std::future::pending::<()>();
// tokio::select! {
// _ = ctrl_c => {},
// _ = terminate => {},
// };
// }
// tokio::spawn(async move {
// shutdown_signal_handler().await;
// cancel_token_clone.cancel();
// });
// cancel_token
// }