Merge pull request #4950

68f045de easylogging++: check allowed categories before logging (moneromooo-monero)

2 files changed, 21 insertions, 0 deletions

diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc
index ab4ee49c3..f5f7481f8 100644
--- a/external/easylogging++/easylogging++.cc
+++ b/external/easylogging++/easylogging++.cc
@@ -2693,6 +2693,12 @@ Writer& Writer::construct(int count, const char* loggerIds, ...) {
   return *this;
 }
 
+Writer& Writer::construct(const char *loggerId) {
+  initializeLogger(ELPP->registeredLoggers()->get(loggerId, ELPP->hasFlag(LoggingFlag::CreateLoggerAutomatically)));
+  m_messageBuilder.initialize(m_logger);
+  return *this;
+}
+
 void Writer::initializeLogger(const std::string& loggerId, bool lookup, bool needLock) {
   if (lookup) {
     m_logger = ELPP->registeredLoggers()->get(loggerId, ELPP->hasFlag(LoggingFlag::CreateLoggerAutomatically));
@@ -2721,6 +2727,19 @@ void Writer::initializeLogger(const std::string& loggerId, bool lookup, bool nee
   }
 }
 
+void Writer::initializeLogger(Logger *logger, bool needLock) {
+  m_logger = logger;
+  if (m_logger == nullptr) {
+    m_proceed = false;
+  } else {
+    if (needLock) {
+      m_logger->acquireLock();  // This should not be unlocked by checking m_proceed because
+      // m_proceed can be changed by lines below
+    }
+    m_proceed = true;
+  }
+}
+
 void Writer::processDispatch() {
 #if ELPP_LOGGING_ENABLED
   if (ELPP->hasFlag(LoggingFlag::MultiLoggerSupport)) {
diff --git a/external/easylogging++/easylogging++.h b/external/easylogging++/easylogging++.h
index 1e27f62a6..d9a2dc3d1 100644
--- a/external/easylogging++/easylogging++.h
+++ b/external/easylogging++/easylogging++.h
@@ -3290,6 +3290,7 @@ class Writer : base::NoCopy {
 
   Writer& construct(Logger* logger, bool needLock = true);
   Writer& construct(int count, const char* loggerIds, ...);
+  Writer& construct(const char *loggerId);
  protected:
   LogMessage* m_msg;
   Level m_level;
@@ -3305,6 +3306,7 @@ class Writer : base::NoCopy {
   friend class el::Helpers;
 
   void initializeLogger(const std::string& loggerId, bool lookup = true, bool needLock = true);
+  void initializeLogger(Logger *logger, bool needLock = true);
   void processDispatch();
   void triggerDispatch(void);
 };