Merge pull request #1522

5833d66f Change logging to easylogging++ (moneromooo-monero)
dc98019b easylogging++: fix logging with static const header only data members (moneromooo-monero)
3b46617b easylogging++: add ELPP_DISABLE_CHECK_MACROS (moneromooo-monero)
6fe39d90 easylogging++: allow clipping a common filename prefix (moneromooo-monero)
43abf6ff easylogging++: add file-only logs (moneromooo-monero)
c313bea4 eayslogging++: Fix bad memory access before opening any files (moneromooo-monero)
0af5d168 easylogging++: avoid creating directory/filename for the builtin default log file (moneromooo-monero)
28362847 easylogging++: allow setting thread names (moneromooo-monero)
ec71ce8d easylogging++: Print thread ID in a nicer way (moneromooo-monero)
2a0bf783 easylogging++: Add logging categories (moneromooo-monero)
c50bbbfe easylogging++: import upstream (moneromooo-monero)

1 files changed, 9 insertions, 5 deletions

diff --git a/src/common/perf_timer.cpp b/src/common/perf_timer.cpp
index d23c9f11d..3b68485d9 100644
--- a/src/common/perf_timer.cpp
+++ b/src/common/perf_timer.cpp
@@ -28,18 +28,22 @@
 
 #include "perf_timer.h"
 
+#undef MONERO_DEFAULT_LOG_CATEGORY
+#define MONERO_DEFAULT_LOG_CATEGORY "perf"
+
 namespace tools
 {
 
-int performance_timer_log_level = 2;
+el::Level performance_timer_log_level = el::Level::Debug;
 __thread std::vector<PerformanceTimer*> *performance_timers = NULL;
 
-void set_performance_timer_log_level(int level)
+void set_performance_timer_log_level(el::Level level)
 {
-  if (level < LOG_LEVEL_MIN || level > LOG_LEVEL_MAX)
+  if (level != el::Level::Debug && level != el::Level::Trace && level != el::Level::Info
+   && level != el::Level::Warning && level != el::Level::Error && level != el::Level::Fatal)
   {
-    LOG_PRINT_L0("Wrong log level: " << level << ", using 2");
-    level = 2;
+    MERROR("Wrong log level: " << el::LevelHelper::convertToString(level) << ", using Debug");
+    level = el::Level::Debug;
   }
   performance_timer_log_level = level;
 }