Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
move daemonize before creating account provider (#10003)
Browse files Browse the repository at this point in the history
* move daemonize before creating account provider

* daemonize: add a future-proofing comment
  • Loading branch information
ordian authored and niklasad1 committed Dec 16, 2018
1 parent 769da8a commit 5f1f506
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions parity/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,14 @@ fn execute_impl<Cr, Rr>(cmd: RunCmd, logger: Arc<RotatingLogger>, on_client_rq:

let passwords = passwords_from_files(&cmd.acc_conf.password_files)?;

// Run in daemon mode.
// Note, that it should be called before we leave any file descriptor open,
// since `daemonize` will close them.
if let Some(pid_file) = cmd.daemon {
info!("Running as a daemon process!");
daemonize(pid_file)?;
}

// prepare account provider
let account_provider = Arc::new(prepare_account_provider(&cmd.spec, &cmd.dirs, &spec.data_dir, cmd.acc_conf, &passwords)?);

Expand Down Expand Up @@ -544,12 +552,6 @@ fn execute_impl<Cr, Rr>(cmd: RunCmd, logger: Arc<RotatingLogger>, on_client_rq:
// set network path.
net_conf.net_config_path = Some(db_dirs.network_path().to_string_lossy().into_owned());

// run in daemon mode
if let Some(pid_file) = cmd.daemon {
info!("Running as a daemon process!");
daemonize(pid_file)?;
}

let restoration_db_handler = db::restoration_db_handler(&client_path, &client_config);
let client_db = restoration_db_handler.open(&client_path)
.map_err(|e| format!("Failed to open database {:?}", e))?;
Expand Down

0 comments on commit 5f1f506

Please sign in to comment.