Skip to content

Commit 36b12ed

Browse files
committed
Fix logging lock, future optimizations may needed
1 parent 911c679 commit 36b12ed

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

external/easylogging++/easylogging++.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3260,12 +3260,12 @@ class Writer : base::NoCopy {
32603260
const char* func, base::DispatchAction dispatchAction = base::DispatchAction::NormalLog,
32613261
base::type::VerboseLevel verboseLevel = 0) :
32623262
m_msg(nullptr), m_level(level), m_color(color), m_file(file), m_line(line), m_func(func), m_verboseLevel(verboseLevel),
3263-
m_logger(nullptr), m_proceed(false), m_dispatchAction(dispatchAction) {
3263+
m_logger(nullptr), m_proceed(false), m_dispatchAction(dispatchAction), m_sync(ELPP->lock()) {
32643264
}
32653265

32663266
Writer(LogMessage* msg, base::DispatchAction dispatchAction = base::DispatchAction::NormalLog) :
32673267
m_msg(msg), m_level(msg != nullptr ? msg->level() : Level::Unknown),
3268-
m_line(0), m_logger(nullptr), m_proceed(false), m_dispatchAction(dispatchAction) {
3268+
m_line(0), m_logger(nullptr), m_proceed(false), m_dispatchAction(dispatchAction), m_sync(ELPP->lock()) {
32693269
}
32703270

32713271
virtual ~Writer(void) {
@@ -3323,6 +3323,7 @@ class Writer : base::NoCopy {
33233323
base::MessageBuilder m_messageBuilder;
33243324
base::DispatchAction m_dispatchAction;
33253325
std::vector<std::string> m_loggerIds;
3326+
base::threading::ScopedLock m_sync;
33263327
friend class el::Helpers;
33273328

33283329
void initializeLogger(const std::string& loggerId, bool lookup = true, bool needLock = true);

0 commit comments

Comments
 (0)