Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 06:44:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Repeated logging - Fixes and clean-up

Browse source
This commit is contained in:
Simon Walton 2018-04-03 12:23:21 -07:00
parent a7fc6a2991
commit 5b0bcd76e3
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/networking/src/NetworkLogging.h
View file

@ -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)

8
libraries/shared/src/LogHandler.cpp
View file

@ -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;