From f9033facd3ec2ceffc09621e4cd354e5363dbbcc Mon Sep 17 00:00:00 2001 From: Anton Gavrilov Date: Thu, 22 Jun 2017 21:08:56 +0300 Subject: [PATCH] Information about used paths added to general output block (#5904) * Information about used paths added to general output block * Print was added into execute light also --- parity/run.rs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/parity/run.rs b/parity/run.rs index 4368a6376..bcb18aeeb 100644 --- a/parity/run.rs +++ b/parity/run.rs @@ -43,7 +43,7 @@ use params::{ }; use helpers::{to_client_config, execute_upgrades, passwords_from_files}; use upgrade::upgrade_key_location; -use dir::Directories; +use dir::{Directories, DatabaseDirectories}; use cache::CacheConfig; use user_defaults::UserDefaults; use dapps; @@ -193,7 +193,9 @@ fn execute_light(cmd: RunCmd, can_restart: bool, logger: Arc) -> // create dirs used by parity cmd.dirs.create_dirs(cmd.dapps_conf.enabled, cmd.ui_conf.enabled, cmd.secretstore_conf.enabled)?; - info!("Starting {}", Colour::White.bold().paint(version())); + //print out running parity environment + print_running_environment(&spec.name, &cmd.dirs, &db_dirs, &cmd.dapps_conf); + info!("Running in experimental {} mode.", Colour::Blue.bold().paint("Light Client")); // TODO: configurable cache size. @@ -396,8 +398,10 @@ pub fn execute(cmd: RunCmd, can_restart: bool, logger: Arc) -> R daemonize(pid_file)?; } + //print out running parity environment + print_running_environment(&spec.name, &cmd.dirs, &db_dirs, &cmd.dapps_conf); + // display info about used pruning algorithm - info!("Starting {}", Colour::White.bold().paint(version())); info!("State DB configuration: {}{}{}", Colour::White.bold().paint(algorithm.as_str()), match fat_db { @@ -758,6 +762,13 @@ fn daemonize(_pid_file: String) -> Result<(), String> { Err("daemon is no supported on windows".into()) } +fn print_running_environment(spec_name: &String, dirs: &Directories, db_dirs: &DatabaseDirectories, dapps_conf: &dapps::Configuration) { + info!("Starting {}", Colour::White.bold().paint(version())); + info!("Keys path {}", Colour::White.bold().paint(dirs.keys_path(spec_name).to_string_lossy().into_owned())); + info!("DB path {}", Colour::White.bold().paint(db_dirs.db_root_path().to_string_lossy().into_owned())); + info!("Path to dapps {}", Colour::White.bold().paint(dapps_conf.dapps_path.to_string_lossy().into_owned())); +} + fn prepare_account_provider(spec: &SpecType, dirs: &Directories, data_dir: &str, cfg: AccountsConfig, passwords: &[String]) -> Result { use ethcore::ethstore::EthStore; use ethcore::ethstore::dir::RootDiskDirectory;