diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-04-11 00:24:08 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-04-11 00:24:08 +0200 |
| commit | de68b005960f062111d82ac600f9c05b456a6e80 (patch) | |
| tree | 3f3857c6975bc12d72ea4377c5217c28c9858832 /contrib/epee | |
| parent | Merge pull request #1946 (diff) | |
| parent | mlog: direct log category changes to file only (diff) | |
| download | monero-de68b005960f062111d82ac600f9c05b456a6e80.tar.xz | |
Merge pull request #1948
62efe5f6 mlog: direct log category changes to file only (moneromooo-monero)
Diffstat (limited to 'contrib/epee')
| -rw-r--r-- | contrib/epee/src/mlog.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp index 205acccc9..7487fdbd2 100644 --- a/contrib/epee/src/mlog.cpp +++ b/contrib/epee/src/mlog.cpp @@ -33,8 +33,13 @@ INITIALIZE_EASYLOGGINGPP +#undef MONERO_DEFAULT_LOG_CATEGORY +#define MONERO_DEFAULT_LOG_CATEGORY "logging" + #define MLOG_BASE_FORMAT "%datetime{%Y-%M-%d %H:%m:%s.%g}\t%thread\t%level\t%logger\t%loc\t%msg" +#define MLOG_LOG(x) CINFO(el::base::Writer,el::base::DispatchAction::FileOnlyLog,MONERO_DEFAULT_LOG_CATEGORY) << x + using namespace epee; static std::string generate_log_filename(const char *base) @@ -88,10 +93,10 @@ static const char *get_default_categories(int level) switch (level) { case 0: - categories = "*:WARNING,net:FATAL,net.p2p:FATAL,net.cn:FATAL,global:INFO,verify:FATAL,stacktrace:INFO"; + categories = "*:WARNING,net:FATAL,net.p2p:FATAL,net.cn:FATAL,global:INFO,verify:FATAL,stacktrace:INFO,logging:INFO"; break; case 1: - categories = "*:WARNING,global:INFO,stacktrace:INFO"; + categories = "*:WARNING,global:INFO,stacktrace:INFO,logging:INFO"; break; case 2: categories = "*:DEBUG"; @@ -142,7 +147,7 @@ void mlog_configure(const std::string &filename_base, bool console) void mlog_set_categories(const char *categories) { el::Loggers::setCategories(categories); - MGINFO("New log categories: " << categories); + MLOG_LOG("New log categories: " << categories); } // maps epee style log level to new logging system @@ -150,7 +155,7 @@ void mlog_set_log_level(int level) { const char *categories = get_default_categories(level); el::Loggers::setCategories(categories); - MGINFO("New log categories: " << categories); + MLOG_LOG("New log categories: " << categories); } void mlog_set_log(const char *log) |