From 39c33a25ff7c4c09794a78ca2f5e6e8fd4cda16c Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 12 Apr 2023 11:14:16 +1000 Subject: [PATCH 1/3] Disable bug report URLs for a known abscissa panic --- zebrad/src/application.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/zebrad/src/application.rs b/zebrad/src/application.rs index 07608408d5e..1220244eebc 100644 --- a/zebrad/src/application.rs +++ b/zebrad/src/application.rs @@ -1,8 +1,5 @@ //! Zebrad Abscissa Application -mod entry_point; -use self::entry_point::EntryPoint; - use std::{fmt::Write as _, io::Write as _, process}; use abscissa_core::{ @@ -18,6 +15,9 @@ use zebra_state::constants::{DATABASE_FORMAT_VERSION, LOCK_FILE_ERROR}; use crate::{commands::ZebradCmd, components::tracing::Tracing, config::ZebradConfig}; +mod entry_point; +use entry_point::EntryPoint; + /// See /// Print a fatal error message and exit fn fatal_error(app_name: String, err: &dyn std::error::Error) -> ! { @@ -309,10 +309,14 @@ impl Application for ZebradApp { return false; } + // Don't ask users to create bug reports for timeouts, duplicate blocks, + // full disks, or updated binaries. let error_str = error.to_string(); !error_str.contains("timed out") && !error_str.contains("duplicate hash") && !error_str.contains("No space left on device") + // abscissa panics like this when the running zebrad binary has been updated + && !error_str.contains("error canonicalizing application path") } }); From 0f91833ceb4ca3e89aa66fa11d4aa48189e41933 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 12 Apr 2023 11:17:29 +1000 Subject: [PATCH 2/3] Remove trailing whitespace in deny.toml --- deny.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deny.toml b/deny.toml index 7db861735cc..fe36338971a 100644 --- a/deny.toml +++ b/deny.toml @@ -90,7 +90,7 @@ skip-tree = [ # wait for console-subscriber and tower to update hdrhistogram. # also wait for ron to update insta, and wait for tonic update. { name = "base64", version = "=0.13.1" }, - + # wait for proptest's rusty-fork dependency to upgrade quick-error { name = "quick-error", version = "=1.2.3" }, From 0458124385f8e41136c9ac602416ece707213e31 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Thu, 13 Apr 2023 09:26:03 -0300 Subject: [PATCH 3/3] upddate doc Co-authored-by: Deirdre Connolly --- zebrad/src/application.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zebrad/src/application.rs b/zebrad/src/application.rs index 1220244eebc..4408de1119a 100644 --- a/zebrad/src/application.rs +++ b/zebrad/src/application.rs @@ -309,7 +309,7 @@ impl Application for ZebradApp { return false; } - // Don't ask users to create bug reports for timeouts, duplicate blocks, + // Don't ask users to create bug reports for known timeouts, duplicate blocks, // full disks, or updated binaries. let error_str = error.to_string(); !error_str.contains("timed out")