Skip to content

Commit 7224e38

Browse files
committed
fix(node): remove custom SIGINT and SIGTERM signal handlers
1 parent e4b51a5 commit 7224e38

File tree

1 file changed

+30
-36
lines changed

1 file changed

+30
-36
lines changed

node/src/main.rs

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn main() {
2626
async fn main_inner() {
2727
env_logger::init();
2828

29-
let cancel_token = shutdown_token();
29+
let cancel_token = CancellationToken::new();
3030
let env_vars = Arc::new(EnvVars::from_env().unwrap());
3131
let opt = opt::Opt::parse();
3232

@@ -66,38 +66,32 @@ async fn main_inner() {
6666
.await;
6767
}
6868

69-
fn shutdown_token() -> CancellationToken {
70-
use tokio::signal;
71-
72-
let cancel_token = CancellationToken::new();
73-
let cancel_token_clone = cancel_token.clone();
74-
75-
async fn shutdown_signal_handler() {
76-
let ctrl_c = async {
77-
signal::ctrl_c().await.unwrap();
78-
};
79-
80-
#[cfg(unix)]
81-
let terminate = async {
82-
signal::unix::signal(signal::unix::SignalKind::terminate())
83-
.unwrap()
84-
.recv()
85-
.await;
86-
};
87-
88-
#[cfg(not(unix))]
89-
let terminate = std::future::pending::<()>();
90-
91-
tokio::select! {
92-
_ = ctrl_c => {},
93-
_ = terminate => {},
94-
};
95-
}
96-
97-
tokio::spawn(async move {
98-
shutdown_signal_handler().await;
99-
cancel_token_clone.cancel();
100-
});
101-
102-
cancel_token
103-
}
69+
// TODO: Removed until all graph-node components are updated to handle the cancel signal.
70+
// fn shutdown_token() -> CancellationToken {
71+
// use tokio::signal;
72+
// let cancel_token = CancellationToken::new();
73+
// let cancel_token_clone = cancel_token.clone();
74+
// async fn shutdown_signal_handler() {
75+
// let ctrl_c = async {
76+
// signal::ctrl_c().await.unwrap();
77+
// };
78+
// #[cfg(unix)]
79+
// let terminate = async {
80+
// signal::unix::signal(signal::unix::SignalKind::terminate())
81+
// .unwrap()
82+
// .recv()
83+
// .await;
84+
// };
85+
// #[cfg(not(unix))]
86+
// let terminate = std::future::pending::<()>();
87+
// tokio::select! {
88+
// _ = ctrl_c => {},
89+
// _ = terminate => {},
90+
// };
91+
// }
92+
// tokio::spawn(async move {
93+
// shutdown_signal_handler().await;
94+
// cancel_token_clone.cancel();
95+
// });
96+
// cancel_token
97+
// }

0 commit comments

Comments
 (0)