wallet: fix --log-file not working
This commit is contained in:
parent
beee286c7b
commit
b8a08f199a
|
@ -4333,7 +4333,8 @@ int main(int argc, char* argv[])
|
|||
argc, argv,
|
||||
"monero-wallet-cli [--wallet-file=<file>|--generate-new-wallet=<file>] [<COMMAND>]",
|
||||
desc_params,
|
||||
positional_options
|
||||
positional_options,
|
||||
"monero-wallet-cli.log"
|
||||
);
|
||||
|
||||
if (!vm)
|
||||
|
|
|
@ -73,6 +73,7 @@ namespace wallet_args
|
|||
const char* const usage,
|
||||
boost::program_options::options_description desc_params,
|
||||
const boost::program_options::positional_options_description& positional_options,
|
||||
const char *default_log_name,
|
||||
bool log_to_console)
|
||||
|
||||
{
|
||||
|
@ -106,35 +107,9 @@ namespace wallet_args
|
|||
po::options_description desc_all;
|
||||
desc_all.add(desc_general).add(desc_params);
|
||||
po::variables_map vm;
|
||||
std::string log_path;
|
||||
bool r = command_line::handle_error_helper(desc_all, [&]()
|
||||
{
|
||||
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))
|
||||
{
|
||||
tools::msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
|
||||
tools::msg_writer() << wallet_args::tr("Usage:") << ' ' << usage;
|
||||
tools::msg_writer() << desc_all;
|
||||
return false;
|
||||
}
|
||||
else if (command_line::get_arg(vm, command_line::arg_version))
|
||||
{
|
||||
tools::msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
|
||||
return false;
|
||||
}
|
||||
|
||||
auto parser = po::command_line_parser(argc, argv).options(desc_params).positional(positional_options);
|
||||
auto parser = po::command_line_parser(argc, argv).options(desc_all).positional(positional_options);
|
||||
po::store(parser.run(), vm);
|
||||
po::notify(vm);
|
||||
return true;
|
||||
|
@ -142,6 +117,30 @@ namespace wallet_args
|
|||
if (!r)
|
||||
return boost::none;
|
||||
|
||||
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(default_log_name);
|
||||
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());
|
||||
}
|
||||
|
||||
if (command_line::get_arg(vm, command_line::arg_help))
|
||||
{
|
||||
tools::msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
|
||||
tools::msg_writer() << wallet_args::tr("Usage:") << ' ' << usage;
|
||||
tools::msg_writer() << desc_all;
|
||||
return boost::none;
|
||||
}
|
||||
else if (command_line::get_arg(vm, command_line::arg_version))
|
||||
{
|
||||
tools::msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
|
||||
return boost::none;
|
||||
}
|
||||
|
||||
if(command_line::has_arg(vm, arg_max_concurrency))
|
||||
tools::set_max_concurrency(command_line::get_arg(vm, arg_max_concurrency));
|
||||
|
||||
|
|
|
@ -50,5 +50,5 @@ namespace wallet_args
|
|||
const char* const usage,
|
||||
boost::program_options::options_description desc_params,
|
||||
const boost::program_options::positional_options_description& positional_options,
|
||||
bool log_to_console = false);
|
||||
const char *default_log_name, bool log_to_console = false);
|
||||
}
|
||||
|
|
|
@ -1397,6 +1397,7 @@ int main(int argc, char** argv) {
|
|||
"monero-wallet-rpc [--wallet-file=<file>|--generate-from-json=<file>] [--rpc-bind-port=<port>]",
|
||||
desc_params,
|
||||
po::positional_options_description(),
|
||||
"monero-wallet-rpc.log",
|
||||
true
|
||||
);
|
||||
if (!vm)
|
||||
|
|
Loading…
Reference in New Issue