From 28d0b11fdea0000f5dadb10c73e11d9fbeea993a Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sun, 12 Feb 2017 11:35:04 +0000 Subject: [PATCH 1/3] mlog: s/Mew/New/ in log --- contrib/epee/src/mlog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp index 7f9ef4b3a..18c3c3e98 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); + MINFO("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); + MINFO("New log categories: " << categories); } void mlog_set_log(const char *log) From 38a1b9c956532a09ecb5f3d8f22859acabfefab5 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sun, 12 Feb 2017 11:37:09 +0000 Subject: [PATCH 2/3] rpc: fix daemon mixed style set_log 2,category:level --- src/rpc/core_rpc_server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 5442b6ac4..94a7d9579 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -736,7 +736,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; } From 3b6839cc96b6dbcf28d76dfad980587fba05047b Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sun, 12 Feb 2017 11:45:22 +0000 Subject: [PATCH 3/3] mlog: move log level changes to global level Makes it more likely to show up --- contrib/epee/src/mlog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp index 18c3c3e98..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("New 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("New log categories: " << categories); + MGINFO("New log categories: " << categories); } void mlog_set_log(const char *log)