aboutsummaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
Diffstat (limited to 'external')
-rw-r--r--external/easylogging++/easylogging++.cc19
-rw-r--r--external/easylogging++/easylogging++.h2
2 files changed, 21 insertions, 0 deletions
diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc
index d57f3f3a0..aa8c80a8a 100644
--- a/external/easylogging++/easylogging++.cc
+++ b/external/easylogging++/easylogging++.cc
@@ -2699,6 +2699,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));
@@ -2727,6 +2733,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 046252a5b..a642d2748 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);
};