aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-03-21 11:17:05 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-03-21 11:17:05 +0000
commit995969b1907ee2d55c31ec9a40c39d5518e0ed87 (patch)
treed6524dbd9da92fab6aa3c6ff9ad28e39c47ed9b7
parentMerge pull request #1902 (diff)
downloadmonero-995969b1907ee2d55c31ec9a40c39d5518e0ed87.tar.xz
wallet: fix set_log not handling 0,xxx style settings
-rw-r--r--src/simplewallet/simplewallet.cpp16
-rw-r--r--src/wallet/api/wallet_manager.cpp2
2 files changed, 2 insertions, 16 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 8fcefc06b..134841a25 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -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;
}
//----------------------------------------------------------------------------------------------------
diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp
index ea2a66275..8e86c87b3 100644
--- a/src/wallet/api/wallet_manager.cpp
+++ b/src/wallet/api/wallet_manager.cpp
@@ -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());
}