Merge pull request #647 from nervosnetwork/graceful-shutdown-sigterm

feat: graceful shutdown on SIGTERM too

crates/block-producer/Cargo.toml

@@ -41,7 +41,6 @@ serde = { version = "1.0", features = ["derive"] }
 async-channel = "1.4.2"
 async-jsonrpc-client = { version = "0.3.0", default-features = false, features = ["http-tokio"] }
 clap = "2.33.3"
-ctrlc = {version = "3.2.1", features = ["termination"]}
 futures = "0.3.13"
 log = "0.4.14"
 serde_json = "1.0"

crates/block-producer/src/runner.rs

@@ -954,15 +954,15 @@ pub async fn run(config: Config, skip_config_check: bool) -> Result<()> {
     match rpc_ws_task {
         Some(rpc_ws_task) => {
             tokio::select! {
-                _ = tokio::signal::ctrl_c() => { },
+                _ = sigint_or_sigterm() => { },
                 _ = chain_task => {},
                 _ = rpc_ws_task => {},
                 _ = rpc_task => {},
             }
         }
         None => {
             tokio::select! {
-                _ = tokio::signal::ctrl_c() => { },
+                _ = sigint_or_sigterm() => { },
                 _ = chain_task => {},
                 _ = rpc_task => {},
             };
@@ -1123,3 +1123,19 @@ fn is_l1_query_error(err: &anyhow::Error) -> bool {
     err.downcast_ref::<RPCRequestError>().is_some()
         || err.downcast_ref::<QueryL1TxError>().is_some()
 }
+
+async fn sigint_or_sigterm() {
+    let int = tokio::signal::ctrl_c();
+    #[cfg(unix)]
+    let mut term = tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
+        .expect("creating SIGTERM stream");
+    #[cfg(unix)]
+    tokio::select! {
+        _ = int => {}
+        _ = term.recv() => {}
+    }
+    #[cfg(not(unix))]
+    let _ = int.await;
+
+    log::info!("received sigint or sigterm, shutting down");
+}