cli overhaul (#1600)
* cli commands * cleanup parity/signer * cleanup parity/signer * remove redundant import of signer crate from main.rs * cli cleanup in progress * cli cleanup in progress * moved few commonly used functions to separate methods with tests * cleaning up blockchain import in progress * cleaning up blockchain import in progress2 * cleaning up blockchain import in progress3 * tests for database compaction profile parsing * cleaning up blockchain import in progress4 * cleaning up blockchain import in progress5 * blockchain import * export blockchain in progress * cleanup execute_export * Configuration::to_duration cleaned up * removed unused code, tests for to_duration * cleanup Configuration::mode function * parsing some of the cli params in params.rs * rpc and signer are no longer optional * move importing extern crates to main.rs file * swipe dies from rpc module * swipe dies from dapps * finding deprecated * several tests and fixes for parity * parity cleanup in progress * cleanup price parsing * parity cleanup in progress * swiped all dies * parity cleanup in progress * replace usages of from_str with parse() in parity/params.rs * removed few more from_str * split parity/params.rs into params and helpers * removed wildcard import from configuration.rs * cleanup directories/path creation * cleaning up run cmd * moved LoggerConfig * defaults for cli params * fixed indention in raise_fd_limit * tests for rpc_apis * tests for default ipc and rpc settings * ipc socket * cleanup in progress * account service * cleanup miner config * BlockChain commands use Directiores structure now * client_config * network settings and dapps configuration * removing warnings * default logger config * fixed client_path * overhaul * fixing export && import * default export DataFormat * import and export also upgrade db * fixed export && import * polishing pr * polishing pr * fixed custom bootnodes * fixed daemonize on windows * fixed setting up enable network * finished pr * fixed compiling on windows * Fixed warning; windows build * Better cache management * Fixed tests on windows * Fixed test * Restored pruning method names * --cache alias * Fixed more tests * Ensure default options actually listed as valid [ci:skip]
This commit is contained in:
@@ -38,8 +38,7 @@ use ethsync::{SyncProvider, EthSync, ManageNetwork, ServiceConfiguration};
|
||||
use std::thread;
|
||||
use nanoipc::IpcInterface;
|
||||
|
||||
use ethcore_logger::Settings as LogSettings;
|
||||
use ethcore_logger::setup_log;
|
||||
use ethcore_logger::{Config as LogConfig, setup_log};
|
||||
|
||||
const USAGE: &'static str = "
|
||||
Ethcore sync service
|
||||
@@ -63,18 +62,12 @@ struct Args {
|
||||
}
|
||||
|
||||
impl Args {
|
||||
pub fn log_settings(&self) -> LogSettings {
|
||||
let mut settings = LogSettings::new();
|
||||
if self.flag_no_color || cfg!(windows) {
|
||||
settings = settings.no_color();
|
||||
pub fn log_settings(&self) -> LogConfig {
|
||||
LogConfig {
|
||||
color: self.flag_no_color || cfg!(windows),
|
||||
mode: self.flag_logging.clone(),
|
||||
file: self.flag_log_file.clone(),
|
||||
}
|
||||
if let Some(ref init) = self.flag_logging {
|
||||
settings = settings.init(init.to_owned())
|
||||
}
|
||||
if let Some(ref file) = self.flag_log_file {
|
||||
settings = settings.file(file.to_owned())
|
||||
}
|
||||
settings
|
||||
}
|
||||
}
|
||||
|
||||
@@ -97,7 +90,7 @@ fn main() {
|
||||
.and_then(|d| d.decode())
|
||||
.unwrap_or_else(|e| e.exit());
|
||||
|
||||
setup_log(&args.log_settings());
|
||||
setup_log(&args.log_settings()).expect("Log initialization failure");
|
||||
|
||||
let mut buffer = Vec::new();
|
||||
io::stdin().read_to_end(&mut buffer).expect("Failed to read initialisation payload");
|
||||
|
||||
Reference in New Issue
Block a user