monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1904

Browse source 
995969b1 wallet: fix set_log not handling 0,xxx style settings (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-03-21 14:09:42 +02:00
commit 70e71a1845
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/simplewallet/simplewallet.cpp
View file

@ -851,21 +851,7 @@ bool simple_wallet::set_log(const std::vector<std::string> &args)
fail_msg_writer() << tr("usage: set_log <log_level_number_0-4> | <categories>");
return true;
}
uint16_t l = 0;
if(epee::string_tools::get_xtype_from_string(l, args[0]))
{
if(4 < l)
{
fail_msg_writer() << tr("wrong number range, use: set_log <log_level_number_0-4>");
return true;
}
mlog_set_log_level(l);
}
else
{
mlog_set_categories(args.front().c_str());
}
mlog_set_log(args[0].c_str());
return true;
}
//----------------------------------------------------------------------------------------------------

2
src/wallet/api/wallet_manager.cpp
View file

@ -494,7 +494,7 @@ void WalletManagerFactory::setLogLevel(int level)
void WalletManagerFactory::setLogCategories(const std::string &categories)
{
mlog_set_categories(categories.c_str());
mlog_set_log(categories.c_str());
}