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)

2 files changed, 3 insertions, 3 deletions

diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp
index 7f9ef4b3a..c212456f6 100644
--- a/contrib/epee/src/mlog.cpp
+++ b/contrib/epee/src/mlog.cpp
@@ -142,7 +142,7 @@ void mlog_configure(const std::string &filename_base, bool console)
 void mlog_set_categories(const char *categories)
 {
   el::Loggers::setCategories(categories);
-  MINFO("Mew log categories: " << categories);
+  MGINFO("New log categories: " << categories);
 }
 
 // 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);
   el::Loggers::setCategories(categories);
-  MINFO("Mew log categories: " << categories);
+  MGINFO("New log categories: " << categories);
 }
 
 void mlog_set_log(const char *log)
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 1caf737ca..8165dacbc 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -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)
   {
-    mlog_set_categories(req.categories.c_str());
+    mlog_set_log(req.categories.c_str());
     res.status = CORE_RPC_STATUS_OK;
     return true;
   }