Merge pull request #3643

e2b7558 handle improper log levels (cryptochangements34)
This commit is contained in:
luigi1111 2018-06-12 12:13:07 -05:00
commit ed139efc5d
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 18 additions and 2 deletions

View File

@ -2451,8 +2451,24 @@ bool simple_wallet::set_log(const std::vector<std::string> &args)
fail_msg_writer() << tr("usage: set_log <log_level_number_0-4> | <categories>"); fail_msg_writer() << tr("usage: set_log <log_level_number_0-4> | <categories>");
return true; return true;
} }
if (!args.empty()) if(!args.empty())
mlog_set_log(args[0].c_str()); {
uint16_t level = 0;
if(epee::string_tools::get_xtype_from_string(level, args[0]))
{
if(4 < level)
{
fail_msg_writer() << tr("wrong number range, use: set_log <log_level_number_0-4> | <categories>");
return true;
}
mlog_set_log_level(level);
}
else
{
mlog_set_log(args[0].c_str());
}
}
success_msg_writer() << "New log categories: " << mlog_get_categories(); success_msg_writer() << "New log categories: " << mlog_get_categories();
return true; return true;
} }