Fix shutdown. (#822)

src/main.rs

@@ -57,6 +57,8 @@ async fn sequencer_app(args: Args) -> anyhow::Result<()> {
     tracing::info!("Shutting down");
     shutdown.shutdown();
 
+    shutdown.await_shutdown_complete().await;
+
     Ok(())
 }
 

src/shutdown.rs

@@ -102,7 +102,6 @@ impl Shutdown {
                 _ = self.await_shutdown_complete() => {
                     let elapsed = start.elapsed();
                     info!("shutdown channel closed, gracefully shut down in {:?}", elapsed);
-                    std::process::exit(0);
                 },
                 _ = tokio::time::sleep(timeout) => {
                     error!("shutdown monitor timed out");

src/utils/mod.rs

@@ -223,7 +223,13 @@ mod tests {
         tokio::time::sleep(Duration::from_millis(50)).await;
         assert!(handle.is_finished(), "Task should be finished");
 
-        tokio::time::sleep(Duration::from_millis(100)).await;
-        panic!("The process should have exited already");
+        select! {
+                _ = shutdown.await_shutdown_complete() => {
+                    Ok(())
+                },
+                _ = tokio::time::sleep(Duration::from_millis(100)) => {
+                    panic!("The process should have exited already");
+                }
+        }
     }
 }

tests/graceful_shutdown.rs

@@ -3,6 +3,7 @@
 mod common;
 
 use common::prelude::*;
+use tokio::select;
 
 const IDLE_TIME: u64 = 5;
 
@@ -64,6 +65,12 @@ async fn graceful_shutdown(offchain_mode_enabled: bool) -> anyhow::Result<()> {
     tokio::time::sleep(Duration::from_secs(IDLE_TIME)).await;
     shutdown.shutdown();
 
-    tokio::time::sleep(Duration::from_secs(5)).await;
-    panic!("error: process took longer than 5 seconds to shutdown");
+    select! {
+            _ = shutdown.await_shutdown_complete() => {
+                Ok(())
+            },
+            _ = tokio::time::sleep(Duration::from_secs(5)) => {
+                panic!("error: process took longer than 5 seconds to shutdown");
+            }
+    }
 }