Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 20:17:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Repeated logs - use #define to replace qCDebug

Browse source
This commit is contained in:
Simon Walton 2018-04-03 10:44:53 -07:00
parent 6d078f41e7
commit a7fc6a2991
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/networking/src/LimitedNodeList.cpp
View file

@ -351,11 +351,8 @@ bool LimitedNodeList::packetSourceAndHashMatchAndTrackBandwidth(const udt::Packe
//qCDebug(networking) << "Packet of type" << headerType //qCDebug(networking) << "Packet of type" << headerType
// << "received from unknown node with UUID" << uuidStringWithoutCurlyBraces(sourceID); // << "received from unknown node with UUID" << uuidStringWithoutCurlyBraces(sourceID);
static const int repeatedIDUnknownNode = LogHandler::getInstance().newRepeatedMessageID(); HIFI_FDEBUG(networking,
QString logString; "Packet of type" << headerType << "received from unknown node with UUID" << uuidStringWithoutCurlyBraces(sourceID));
QDebug debugString(&logString);
debugString << "Packet of type" << headerType << "received from unknown node with UUID" << uuidStringWithoutCurlyBraces(sourceID);
LogHandler::getInstance().printRepeatedMessage(repeatedIDUnknownNode, LogDebug, QMessageLogContext(), logString);
} }
} }

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

@ -20,4 +20,15 @@ Q_DECLARE_LOGGING_CATEGORY(asset_client)
Q_DECLARE_LOGGING_CATEGORY(entity_script_client) Q_DECLARE_LOGGING_CATEGORY(entity_script_client)
Q_DECLARE_LOGGING_CATEGORY(messages_client) Q_DECLARE_LOGGING_CATEGORY(messages_client)
#define HIFI_FDEBUG(category, msg) \
do { \
if (category().isDebugEnabled()) { \
static int repeatedMessageID_ = LogHandler::getInstance().newRepeatedMessageID(); \
QString logString_; \
QDebug debugString_(&logString_); \
debugString_ << msg; \
LogHandler::getInstance().printRepeatedMessage(repeatedMessageID_, LogDebug, QMessageLogContext(), logString_); \
} \
} while (false)
#endif // hifi_NetworkLogging_h #endif // hifi_NetworkLogging_h

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

@ -111,8 +111,8 @@ void LogHandler::flushRepeatedMessages() {
// New repeat-supress scheme: // New repeat-supress scheme:
for (int m = 0; m < (int)_repeatCounts.size(); ++m) { for (int m = 0; m < (int)_repeatCounts.size(); ++m) {
int repeatCount = _repeatCounts[m]; int repeatCount = _repeatCounts[m];
if (m > 1) { if (repeatCount > 1) {
QString repeatLogMessage = QString(m) + " repeated log entries - Last entry: \"" + _repeatedMessageStrings[m] QString repeatLogMessage = QString(repeatCount) + " repeated log entries - Last entry: \"" + _repeatedMessageStrings[m]
+ "\""; + "\"";
printMessage(LogSuppressed, QMessageLogContext(), repeatLogMessage); printMessage(LogSuppressed, QMessageLogContext(), repeatLogMessage);
_repeatCounts[m] = 0; _repeatCounts[m] = 0;