Correctly shut down the progress bar, and shut it down on an interrupt

ZcashFoundation · Feb 27, 2023 · 049edde · 049edde
1 parent 9ff3e96
commit 049edde
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/zebrad/src/components/sync/progress.rs b/zebrad/src/components/sync/progress.rs
@@ -136,7 +136,9 @@ pub async fn show_block_chain_progress(
 
             // Send progress reports for block height
             #[cfg(feature = "progress-bar")]
-            {
+            if matches!(howudoin::cancelled(), Some(true)) {
+                return;
+            } else {
                 block_bar.set_pos(current_height.0);
                 block_bar.set_len(u64::from(estimated_height.0));
                 block_bar.desc(network_upgrade.to_string());

diff --git a/zebrad/src/components/tokio.rs b/zebrad/src/components/tokio.rs
@@ -111,8 +111,12 @@ mod imp {
             .expect("Failed to register signal handler")
             .recv()
             .await;
+
         zebra_chain::shutdown::set_shutting_down();
 
+        #[cfg(feature = "progress-bar")]
+        howudoin::disable();
+
         info!(
             // use target to remove 'imp' from output
             target: "zebrad::signal",
@@ -131,8 +135,12 @@ mod imp {
         tokio::signal::ctrl_c()
             .await
             .expect("listening for ctrl-c signal should never fail");
+
         zebra_chain::shutdown::set_shutting_down();
 
+        #[cfg(feature = "progress-bar")]
+        howudoin::disable();
+
         info!(
             // use target to remove 'imp' from output
             target: "zebrad::signal",

diff --git a/zebrad/src/components/tracing/component.rs b/zebrad/src/components/tracing/component.rs
@@ -294,8 +294,15 @@ impl<A: abscissa_core::Application> Component<A> for Tracing {
         }
 
         #[cfg(feature = "progress-bar")]
-        howudoin::cancel();
+        howudoin::disable();
 
         Ok(())
     }
 }
+
+impl Drop for Tracing {
+    fn drop(&mut self) {
+        #[cfg(feature = "progress-bar")]
+        howudoin::disable();
+    }
+}