kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1799

Browse source 
2b188151 daemon: avoid pre-log-init spew on creating directories (moneromooo-monero)
cf2b1511 wallet: avoid pre-log-init spew on --version (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-02-24 21:10:25 +02:00
commit 44484acf2d
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/daemon/main.cpp
View file

@ -168,7 +168,6 @@ int main(int argc, char const * argv[])
// Create data dir if it doesn't exist // Create data dir if it doesn't exist
boost::filesystem::path data_dir = boost::filesystem::absolute( boost::filesystem::path data_dir = boost::filesystem::absolute(
command_line::get_arg(vm, data_dir_arg)); command_line::get_arg(vm, data_dir_arg));
tools::create_directories_if_necessary(data_dir.string());
// FIXME: not sure on windows implementation default, needs further review // FIXME: not sure on windows implementation default, needs further review
//bf::path relative_path_base = daemonizer::get_relative_path_base(vm); //bf::path relative_path_base = daemonizer::get_relative_path_base(vm);
@ -216,6 +215,9 @@ int main(int argc, char const * argv[])
mlog_set_log(command_line::get_arg(vm, daemon_args::arg_log_level).c_str()); mlog_set_log(command_line::get_arg(vm, daemon_args::arg_log_level).c_str());
} }
// after logs initialized
tools::create_directories_if_necessary(data_dir.string());
// If there are positional options, we're running a daemon command // If there are positional options, we're running a daemon command
{ {
auto command = command_line::get_arg(vm, daemon_args::arg_command); auto command = command_line::get_arg(vm, daemon_args::arg_command);

22
src/wallet/wallet_args.cpp
View file

@ -106,10 +106,21 @@ namespace wallet_args
po::options_description desc_all; po::options_description desc_all;
desc_all.add(desc_general).add(desc_params); desc_all.add(desc_general).add(desc_params);
po::variables_map vm; po::variables_map vm;
std::string log_path;
bool r = command_line::handle_error_helper(desc_all, [&]() bool r = command_line::handle_error_helper(desc_all, [&]()
{ {
po::store(command_line::parse_command_line(argc, argv, desc_general, true), vm); po::store(command_line::parse_command_line(argc, argv, desc_general, true), vm);
if (command_line::has_arg(vm, arg_log_file))
log_path = command_line::get_arg(vm, arg_log_file);
else
log_path = mlog_get_default_log_path("monero-wallet-cli.log");
mlog_configure(log_path, log_to_console);
if (command_line::has_arg(vm, arg_log_level))
{
mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
}
if (command_line::get_arg(vm, command_line::arg_help)) if (command_line::get_arg(vm, command_line::arg_help))
{ {
tools::msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")"; tools::msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
@ -134,17 +145,6 @@ namespace wallet_args
if(command_line::has_arg(vm, arg_max_concurrency)) if(command_line::has_arg(vm, arg_max_concurrency))
tools::set_max_concurrency(command_line::get_arg(vm, arg_max_concurrency)); tools::set_max_concurrency(command_line::get_arg(vm, arg_max_concurrency));
std::string log_path;
if (!vm["log-file"].defaulted())
log_path = command_line::get_arg(vm, arg_log_file);
else
log_path = mlog_get_default_log_path("monero-wallet-cli.log");
mlog_configure(log_path, log_to_console);
if (!vm["log-level"].defaulted())
{
mlog_set_log(command_line::get_arg(vm, arg_log_level).c_str());
}
tools::scoped_message_writer(epee::console_color_white, true) << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")"; tools::scoped_message_writer(epee::console_color_white, true) << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
if (!vm["log-level"].defaulted()) if (!vm["log-level"].defaulted())