Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1712 

3b6839cc mlog: move log level changes to global level (moneromooo-monero)
38a1b9c9 rpc: fix daemon mixed style set_log 2,category:level (moneromooo-monero)
28d0b11f mlog: s/Mew/New/ in log (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-02-12 23:25:07 +02:00
parent b1df7f114d 3b6839cc96
commit b0e992237e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/epee/src/mlog.cpp
View File

@ -142,7 +142,7 @@ void mlog_configure(const std::string &filename_base, bool console)
void mlog_set_categories(const char *categories) void mlog_set_categories(const char *categories)
{ {
el::Loggers::setCategories(categories); el::Loggers::setCategories(categories);
MINFO("Mew log categories: " << categories); MGINFO("New log categories: " << categories);
} }
// maps epee style log level to new logging system // maps epee style log level to new logging system
@ -150,7 +150,7 @@ void mlog_set_log_level(int level)
{ {
const char *categories = get_default_categories(level); const char *categories = get_default_categories(level);
el::Loggers::setCategories(categories); el::Loggers::setCategories(categories);
MINFO("Mew log categories: " << categories); MGINFO("New log categories: " << categories);
} }
void mlog_set_log(const char *log) void mlog_set_log(const char *log)

2
src/rpc/core_rpc_server.cpp
View File

@ -737,7 +737,7 @@ namespace cryptonote
//------------------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------------------
bool core_rpc_server::on_set_log_categories(const COMMAND_RPC_SET_LOG_CATEGORIES::request& req, COMMAND_RPC_SET_LOG_CATEGORIES::response& res) bool core_rpc_server::on_set_log_categories(const COMMAND_RPC_SET_LOG_CATEGORIES::request& req, COMMAND_RPC_SET_LOG_CATEGORIES::response& res)
{ {
mlog_set_categories(req.categories.c_str()); mlog_set_log(req.categories.c_str());
res.status = CORE_RPC_STATUS_OK; res.status = CORE_RPC_STATUS_OK;
return true; return true;
} }