zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Always enable color_eyre, even when color is disabled 

We want to automatically disable colors upstream in color_eyre,
and add a config that allows users to always turn off color.
This commit is contained in:
teor 2020-12-02 15:45:16 +10:00 committed by Henry de Valence
parent bed34168c1
commit 0e42d8b6c1
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
zebrad/src/application.rs
View File

@ -110,6 +110,24 @@ impl Application for ZebradApp {
} }
let terminal = Terminal::new(term_colors); let terminal = Terminal::new(term_colors);
// This MUST happen after `Terminal::new` to ensure our preferred panic
// handler is the last one installed
//
// color_eyre always uses color, but that's an issue we want to solve upstream
// (color_backtrace automatically disables color if stderr is a file)
color_eyre::config::HookBuilder::default()
.issue_url(concat!(env!("CARGO_PKG_REPOSITORY"), "/issues/new"))
.add_issue_metadata("version", env!("CARGO_PKG_VERSION"))
.add_issue_metadata("git commit", Self::GIT_COMMIT)
.issue_filter(|kind| match kind {
color_eyre::ErrorKind::NonRecoverable(_) => true,
color_eyre::ErrorKind::Recoverable(error) => {
!error.is::<tower::timeout::error::Elapsed>()
}
})
.install()
.unwrap();
Ok(vec![Box::new(terminal)]) Ok(vec![Box::new(terminal)])
} }
@ -133,28 +151,6 @@ impl Application for ZebradApp {
.transpose()? .transpose()?
.unwrap_or_default(); .unwrap_or_default();
// Only use color if tracing output is being sent to a terminal
let use_color = config.tracing.use_color && atty::is(atty::Stream::Stdout);
// color_eyre always uses color, so disable it if we don't want color
// (color_backtrace automatically disables color if stderr is a file)
if use_color {
// This MUST happen after `Terminal::new` to ensure our preferred panic
// handler is the last one installed
color_eyre::config::HookBuilder::default()
.issue_url(concat!(env!("CARGO_PKG_REPOSITORY"), "/issues/new"))
.add_issue_metadata("version", env!("CARGO_PKG_VERSION"))
.add_issue_metadata("git commit", Self::GIT_COMMIT)
.issue_filter(|kind| match kind {
color_eyre::ErrorKind::NonRecoverable(_) => true,
color_eyre::ErrorKind::Recoverable(error) => {
!error.is::<tower::timeout::error::Elapsed>()
}
})
.install()
.unwrap();
}
let config = command.process_config(config)?; let config = command.process_config(config)?;
self.config = Some(config); self.config = Some(config);