monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 12:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7929

Browse source 
f4a745d easylogging++: fix missing logs (moneromooo-monero)
This commit is contained in:
luigi1111 2021-09-23 22:18:38 -05:00
commit 728409ec6d
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
external/easylogging++/easylogging++.cc vendored
View file

@ -2968,8 +2968,8 @@ void Writer::initializeLogger(Logger *logger, bool needLock) {
} }
void Writer::processDispatch() { void Writer::processDispatch() {
static std::atomic_flag in_dispatch; static __thread bool in_dispatch = false;
if (in_dispatch.test_and_set()) if (in_dispatch)
{ {
if (m_proceed && m_logger != NULL) if (m_proceed && m_logger != NULL)
{ {
@ -2978,6 +2978,7 @@ void Writer::processDispatch() {
} }
return; return;
} }
in_dispatch = true;
#if ELPP_LOGGING_ENABLED #if ELPP_LOGGING_ENABLED
if (ELPP->hasFlag(LoggingFlag::MultiLoggerSupport)) { if (ELPP->hasFlag(LoggingFlag::MultiLoggerSupport)) {
bool firstDispatched = false; bool firstDispatched = false;
@ -3016,7 +3017,7 @@ void Writer::processDispatch() {
m_logger->releaseLock(); m_logger->releaseLock();
} }
#endif // ELPP_LOGGING_ENABLED #endif // ELPP_LOGGING_ENABLED
in_dispatch.clear(); in_dispatch = false;
} }
void Writer::triggerDispatch(void) { void Writer::triggerDispatch(void) {