From 934ab80f95cf23dc30b10582ac4b6cf8372bff37 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 23 Aug 2025 14:46:48 +0200 Subject: [PATCH] no more recursivity in log #58 --- BaseCommon/Log.h | 104 ++++++++++++++++++++++++++++++----------------- 1 file changed, 66 insertions(+), 38 deletions(-) diff --git a/BaseCommon/Log.h b/BaseCommon/Log.h index 7bf9638..8b43903 100644 --- a/BaseCommon/Log.h +++ b/BaseCommon/Log.h @@ -16,7 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #pragma once #include @@ -39,13 +38,13 @@ private: static uint m_prevMsgCount; static uint m_repeatThreshold; - static void getTimeStamp(std::string& s); + static void getTimeStamp(std::string &s); - template - static void formatLogMessage(std::string& output, LOG_SEVERITY severity, const std::string & f, Args... args) + template + static void formatLogMessage(std::string &output, LOG_SEVERITY severity, const std::string &f, Args... args) { assert(severity != LOG_NONE); - + std::string severityStr(" "); switch (severity) { @@ -58,7 +57,7 @@ private: case LOG_FATAL: severityStr.assign("FATAL "); break; - case LOG_INFO : + case LOG_INFO: severityStr.assign("INFO "); break; case LOG_WARNING: @@ -74,84 +73,113 @@ private: std::string f2("[%s] "); f2.append(f); CStringUtils::string_format_in_place(output, f2, severityStr.c_str(), args...); - boost::trim_if(output, [](char c){ return c == '\n' || c == '\r' || c == ' ' || c == '\t'; }); + boost::trim_if(output, [](char c) + { return c == '\n' || c == '\r' || c == ' ' || c == '\t'; }); output.push_back('\n'); } public: - static void addTarget(CLogTarget * target); + static void addTarget(CLogTarget *target); static void finalise(); - static uint& getRepeatThreshold(); + static uint &getRepeatThreshold(); - template static void logTrace(const std::string & f, Args... args) + template + static void logTrace(const std::string &f, Args... args) { log(LOG_TRACE, f, args...); } - template static void logDebug(const std::string & f, Args... args) + template + static void logDebug(const std::string &f, Args... args) { log(LOG_DEBUG, f, args...); } - template static void logInfo(const std::string & f, Args... args) + template + static void logInfo(const std::string &f, Args... args) { log(LOG_INFO, f, args...); } - template static void logWarning(const std::string & f, Args... args) + template + static void logWarning(const std::string &f, Args... args) { log(LOG_WARNING, f, args...); } - template static void logError(const std::string & f, Args... args) + template + static void logError(const std::string &f, Args... args) { log(LOG_ERROR, f, args...); } - template static void logFatal(const std::string & f, Args... args) + template + static void logFatal(const std::string &f, Args... args) { log(LOG_FATAL, f, args...); } - template static void log(LOG_SEVERITY severity, const std::string & f, Args... args) + template + static void log(LOG_SEVERITY severity, const std::string &f, Args... args) { + // Protect against concurrent access to log targets std::lock_guard lockTarget(m_targetsMutex); - if(m_targets.empty()) + if (m_targets.empty()) return; + // Format the message with the given arguments std::string msg; formatLogMessage(msg, severity, f, args...); - bool repeatedMsg = (msg.compare(m_prevMsg) == 0); + bool repeatedMsg = (msg == m_prevMsg); - if(repeatedMsg && m_repeatThreshold > 0U) { + // Handle repeated messages + if (repeatedMsg && m_repeatThreshold > 0U) { m_prevMsgCount++; - if(m_prevMsgCount >= m_repeatThreshold) + if (m_prevMsgCount >= m_repeatThreshold) + { + // If threshold reached, skip logging this duplicate return; + } } - - m_prevMsg.assign(msg); - if(m_prevMsgCount >= m_repeatThreshold && !repeatedMsg && m_repeatThreshold > 0U) { - formatLogMessage(msg, severity, "Previous message repeated %d times", m_prevMsgCount - m_repeatThreshold + 1); - m_prevMsg.clear(); - } - - std::string timestamp; - getTimeStamp(timestamp); - std::string msgts; - CStringUtils::string_format_in_place(msgts, "[%s] %s", timestamp.c_str(), msg.c_str()); - - for(auto target : m_targets) { - if(severity >= target->getLevel()) { - target->printLog(msgts); + // If we are leaving a repetition sequence, log a summary first + if (!repeatedMsg && m_repeatThreshold > 0U && m_prevMsgCount >= m_repeatThreshold) { + std::string summary; + formatLogMessage(summary, severity, + "Previous message repeated %d times", + m_prevMsgCount - m_repeatThreshold + 1); + + std::string ts; + getTimeStamp(ts); + + std::string summaryLine; + CStringUtils::string_format_in_place(summaryLine, "[%s] %s", ts.c_str(), summary.c_str()); + + for (auto target : m_targets) + { + if (severity >= target->getLevel()) + target->printLog(summaryLine); } - } - if(m_prevMsgCount != 0 && !repeatedMsg) { + // Reset repetition counter after summary m_prevMsgCount = 0; - log(severity, f, args ...); } + + // Always log the current message + std::string ts; + getTimeStamp(ts); + + std::string msgLine; + CStringUtils::string_format_in_place(msgLine, "[%s] %s", ts.c_str(), msg.c_str()); + + for (auto target : m_targets) { + if (severity >= target->getLevel()) + target->printLog(msgLine); + } + + // Save current message for repetition detection + m_prevMsg = msg; } };