use CancellationToken for graceful shutdown

Cargo.toml

@@ -82,4 +82,5 @@ fuels = { version = "0.40", default-features = false }
 serde = { version = "1.0", default-features = false }
 thiserror = "1.0"
 tokio = "1.17"
+tokio-util = "0.7.8"
 tracing = "0.1"

packages/fuel-indexer/Cargo.toml

@@ -37,6 +37,7 @@ tokio = { features = [
     "sync",
     "process",
 ], workspace = true }
+tokio-util = { workspace = true }
 tracing = { workspace = true }
 wasmer = "2.3"
 wasmer-compiler-cranelift = { version = "2.3" }

packages/fuel-indexer/src/commands/run.rs

@@ -100,6 +100,10 @@ pub async fn exec(args: IndexerArgs) -> anyhow::Result<()> {
 
     let service_handle = tokio::spawn(service.run());
 
+    // for graceful shutdown
+    let token = tokio_util::sync::CancellationToken::new();
+    let cloned_token = token.clone();
+
     #[cfg(feature = "api-server")]
     {
         let gql_handle =
@@ -117,11 +121,19 @@ pub async fn exec(args: IndexerArgs) -> anyhow::Result<()> {
                 };
                 let node_handle = tokio::spawn(FuelService::new_node(config));
 
-                let _ = tokio::join!(service_handle, node_handle, gql_handle);
+                tokio::spawn(async move {
+                    let _ = tokio::join!(service_handle, node_handle, gql_handle);
+                    token.cancel();
+                });
 
                 return Ok(());
             }
         }
+
+        tokio::spawn(async move {
+            let _ = tokio::join!(service_handle, gql_handle);
+            token.cancel();
+        });
     }
 
     #[cfg(not(feature = "api-server"))]
@@ -138,13 +150,19 @@ pub async fn exec(args: IndexerArgs) -> anyhow::Result<()> {
                 };
                 let node_handle = tokio::spawn(FuelService::new_node(config));
 
-                let _ = tokio::join!(service_handle, node_handle);
+                tokio::spawn(async move {
+                    let _ = tokio::join!(service_handle, node_handle);
+                    token.cancel();
+                });
 
                 return Ok(());
             }
         }
 
-        let _ = service_handle.await?;
+        tokio::spawn(async move {
+            let _ = service_handle.await?;
+            token.cancel();
+        });
 
         Ok(())
     }
@@ -165,6 +183,9 @@ pub async fn exec(args: IndexerArgs) -> anyhow::Result<()> {
         _ = sigint.recv() => {
             info!("Received SIGINT. Stopping services");
         }
+        _ = cloned_token.cancelled() => {
+            info!("Received cancellation. Stopping services");
+        }
     }
 
     // stop embedded postgres