fix: attempt again to fix rpc-downloader shutdown (#1766)

cloudwalk · Oct 14, 2024 · c7cb308 · c7cb308
1 parent a7d9837
commit c7cb308
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/bin/rpc_downloader.rs b/src/bin/rpc_downloader.rs
@@ -112,13 +112,13 @@ async fn download_blocks(rpc_storage: Arc<dyn ExternalRpcStorage>, chain: Arc<Bl
 
     let mut stream = stream::iter(tasks).buffered(paralellism);
     while let Some(result) = stream.next().await {
-        if let Err(e) = result {
-            tracing::error!(reason = ?e, "download task failed");
-        }
-
         if GlobalState::is_shutdown_warn(TASK_NAME) {
             break;
         }
+
+        if let Err(e) = result {
+            tracing::error!(reason = ?e, "download task failed");
+        }
     }
 
     tracing::info!("download finished");
@@ -144,7 +144,7 @@ async fn download(
     while current <= end_inclusive {
         loop {
             if GlobalState::is_shutdown_warn(TASK_NAME) {
-                break;
+                return Ok(());
             }
 
             // retrieve block