feat(l2): make monitor quit

cmd/ethrex/l2/command.rs

@@ -39,7 +39,7 @@ use std::{
     sync::Arc,
     time::Duration,
 };
-use tokio::sync::Mutex;
+use tokio::{sync::Mutex, task::JoinSet};
 use tokio_util::task::TaskTracker;
 use tracing::{error, info};
 
@@ -155,6 +155,7 @@ impl Command {
 
                 // TODO: Check every module starts properly.
                 let tracker = TaskTracker::new();
+                let mut join_set = JoinSet::new();
 
                 let cancel_token = tokio_util::sync::CancellationToken::new();
 
@@ -191,7 +192,7 @@ impl Command {
                         signer,
                         peer_table.clone(),
                         store.clone(),
-                        tracker.clone(),
+                        tracker,
                         blockchain.clone(),
                     )
                     .await;
@@ -217,20 +218,24 @@ impl Command {
                 )
                 .into_future();
 
-                tracker.spawn(l2_sequencer);
+                join_set.spawn(l2_sequencer);
 
                 tokio::select! {
                     _ = tokio::signal::ctrl_c() => {
-                        info!("Server shut down started...");
-                        let node_config_path = PathBuf::from(data_dir + "/node_config.json");
-                        info!("Storing config at {:?}...", node_config_path);
-                        cancel_token.cancel();
-                        let node_config = NodeConfigFile::new(peer_table, local_node_record.lock().await.clone()).await;
-                        store_node_config_file(node_config, node_config_path).await;
-                        tokio::time::sleep(Duration::from_secs(1)).await;
-                        info!("Server shutting down!");
+                        join_set.abort_all();
+                    }
+                    _ = join_set.join_next() => {
                     }
                 }
+                info!("Server shut down started...");
+                let node_config_path = PathBuf::from(data_dir + "/node_config.json");
+                info!("Storing config at {:?}...", node_config_path);
+                cancel_token.cancel();
+                let node_config =
+                    NodeConfigFile::new(peer_table, local_node_record.lock().await.clone()).await;
+                store_node_config_file(node_config, node_config_path).await;
+                tokio::time::sleep(Duration::from_secs(1)).await;
+                info!("Server shutting down!");
             }
             Self::RemoveDB { datadir, force } => {
                 Box::pin(async {

crates/l2/sequencer/mod.rs

@@ -169,19 +169,22 @@ pub async fn start_l2(
         ));
     }
 
-    while let Some(res) = task_set.join_next().await {
+    if let Some(res) = task_set.join_next().await {
+        // If a task finishes, the whole sequencer should stop
         match res {
             Ok(Ok(_)) => {}
             Ok(Err(err)) => {
                 error!("Error starting Proposer: {err}");
-                task_set.abort_all();
-                break;
             }
             Err(err) => {
                 error!("JoinSet error: {err}");
-                task_set.abort_all();
-                break;
             }
         };
+        task_set.abort_all();
+    } else {
+        // If no tasks were spawned, we let the sequencer run until it is cancelled
+        loop {
+            tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
+        }
     }
 }