diff --git a/libraries/networking/src/NetworkLogging.h b/libraries/networking/src/NetworkLogging.h index 6b54dd2640..fa2b24462a 100644 --- a/libraries/networking/src/NetworkLogging.h +++ b/libraries/networking/src/NetworkLogging.h @@ -27,7 +27,8 @@ Q_DECLARE_LOGGING_CATEGORY(messages_client) QString logString_; \ QDebug debugString_(&logString_); \ debugString_ << msg; \ - LogHandler::getInstance().printRepeatedMessage(repeatedMessageID_, LogDebug, QMessageLogContext(), logString_); \ + LogHandler::getInstance().printRepeatedMessage(repeatedMessageID_, LogDebug, QMessageLogContext(__FILE__, \ + __LINE__, __func__, category().categoryName()), logString_); \ } \ } while (false) diff --git a/libraries/shared/src/LogHandler.cpp b/libraries/shared/src/LogHandler.cpp index 2494711613..b5a0f069e9 100644 --- a/libraries/shared/src/LogHandler.cpp +++ b/libraries/shared/src/LogHandler.cpp @@ -112,8 +112,8 @@ void LogHandler::flushRepeatedMessages() { for (int m = 0; m < (int)_repeatCounts.size(); ++m) { int repeatCount = _repeatCounts[m]; if (repeatCount > 1) { - QString repeatLogMessage = QString(repeatCount) + " repeated log entries - Last entry: \"" + _repeatedMessageStrings[m] - + "\""; + QString repeatLogMessage = QString().setNum(repeatCount) + " repeated log entries - Last entry: \"" + + _repeatedMessageStrings[m] + "\""; printMessage(LogSuppressed, QMessageLogContext(), repeatLogMessage); _repeatCounts[m] = 0; _repeatedMessageStrings[m] = QString(); @@ -239,8 +239,8 @@ int LogHandler::newRepeatedMessageID() { return newMessageId; } -void LogHandler::printRepeatedMessage(int messageID, LogMsgType type, const QMessageLogContext & context, - const QString & message) { +void LogHandler::printRepeatedMessage(int messageID, LogMsgType type, const QMessageLogContext& context, + const QString& message) { QMutexLocker lock(&_mutex); if (messageID >= _currentMessageID) { return;