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

Load config after initializing the Terminal (#848)

This commit is contained in:
Henry de Valence 2020-08-06 17:22:40 -07:00 committed by GitHub
parent c52481c041
commit 6d1a4b2218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
zebrad/src/application.rs
View File

@ -106,6 +106,17 @@ impl Application for ZebradApp {
let mut components = self.framework_components(command)?;
// Load config *after* framework components so that we can
// report an error to the terminal if it occurs.
let config = command
.config_path()
.map(|path| self.load_config(&path))
.transpose()?
.unwrap_or_default();
let config = command.process_config(config)?;
self.config = Some(config);
let cfg_ref = self
.config
.as_ref()
@ -135,16 +146,6 @@ impl Application for ZebradApp {
/// Load this application's configuration and initialize its components.
fn init(&mut self, command: &Self::Cmd) -> Result<(), FrameworkError> {
// Load configuration
let config = command
.config_path()
.map(|path| self.load_config(&path))
.transpose()?
.unwrap_or_default();
let config = command.process_config(config)?;
self.config = Some(config);
// Create and register components with the application.
// We do this first to calculate a proper dependency ordering before
// application configuration is processed