Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-15 00:05:48 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2512

Browse source 
792ba4f0 Log categories can now be added to and removed from (moneromooo-monero)
48f92eb6 easylogging++: add categories getter (moneromooo-monero)
f35afe62 epee: factor log level/categories setting (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-10-02 23:28:59 +04:00
commit 3bab2676ec
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
10 changed files with 78 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/daemon/command_parser_executor.cpp
View file

@ -125,12 +125,17 @@ bool t_command_parser_executor::print_blockchain_info(const std::vector<std::str
bool t_command_parser_executor::set_log_level(const std::vector<std::string>& args)
{
if(args.size() != 1)
if(args.size() > 1)
{
std::cout << "use: set_log [<log_level_number_0-4> | <categories>]" << std::endl;
return true;
}
if (args.empty())
{
return m_executor.set_log_categories("+");
}
uint16_t l = 0;
if(epee::string_tools::get_xtype_from_string(l, args[0]))
{

2
src/daemon/command_server.cpp
View file

@ -141,7 +141,7 @@ t_command_server::t_command_server(
m_command_lookup.set_handler(
"set_log"
, std::bind(&t_command_parser_executor::set_log_level, &m_parser, p::_1)
, "set_log <level>|<categories> - Change current loglevel, <level> is a number 0-4"
, "set_log <level>|<{+,-,}categories> - Change current log level/categories, <level> is a number 0-4"
);
m_command_lookup.set_handler(
"diff"

2
src/daemon/rpc_command_executor.cpp
View file

@ -599,7 +599,7 @@ bool t_rpc_command_executor::set_log_categories(const std::string &categories) {
}
}
tools::success_msg_writer() << "Log categories are now " << categories;
tools::success_msg_writer() << "Log categories are now " << res.categories;
return true;
}