From a7fc6a299176109a669329beff643b54199798f5 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Tue, 3 Apr 2018 10:44:53 -0700
Subject: [PATCH] Repeated logs - use #define to replace qCDebug

---
 libraries/networking/src/LimitedNodeList.cpp |  7 ++-----
 libraries/networking/src/NetworkLogging.h    | 11 +++++++++++
 libraries/shared/src/LogHandler.cpp          |  4 ++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index d73ea8ca9c..c6451fa955 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -351,11 +351,8 @@ bool LimitedNodeList::packetSourceAndHashMatchAndTrackBandwidth(const udt::Packe
             //qCDebug(networking) << "Packet of type" << headerType
             //    << "received from unknown node with UUID" << uuidStringWithoutCurlyBraces(sourceID);
 
-            static const int repeatedIDUnknownNode = LogHandler::getInstance().newRepeatedMessageID();
-            QString logString;
-            QDebug debugString(&logString);
-            debugString << "Packet of type" << headerType << "received from unknown node with UUID" << uuidStringWithoutCurlyBraces(sourceID);
-            LogHandler::getInstance().printRepeatedMessage(repeatedIDUnknownNode, LogDebug, QMessageLogContext(), logString);
+            HIFI_FDEBUG(networking,
+                "Packet of type" << headerType << "received from unknown node with UUID" << uuidStringWithoutCurlyBraces(sourceID));
         }
     }
 
diff --git a/libraries/networking/src/NetworkLogging.h b/libraries/networking/src/NetworkLogging.h
index 518c600efe..6b54dd2640 100644
--- a/libraries/networking/src/NetworkLogging.h
+++ b/libraries/networking/src/NetworkLogging.h
@@ -20,4 +20,15 @@ Q_DECLARE_LOGGING_CATEGORY(asset_client)
 Q_DECLARE_LOGGING_CATEGORY(entity_script_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
diff --git a/libraries/shared/src/LogHandler.cpp b/libraries/shared/src/LogHandler.cpp
index 6b89307ddf..2494711613 100644
--- a/libraries/shared/src/LogHandler.cpp
+++ b/libraries/shared/src/LogHandler.cpp
@@ -111,8 +111,8 @@ void LogHandler::flushRepeatedMessages() {
     // New repeat-supress scheme:
     for (int m = 0; m < (int)_repeatCounts.size(); ++m) {
         int repeatCount = _repeatCounts[m];
-        if (m > 1) {
-            QString repeatLogMessage = QString(m) + " repeated log entries - Last entry: \"" + _repeatedMessageStrings[m]
+        if (repeatCount > 1) {
+            QString repeatLogMessage = QString(repeatCount) + " repeated log entries - Last entry: \"" + _repeatedMessageStrings[m]
                 + "\"";
             printMessage(LogSuppressed, QMessageLogContext(), repeatLogMessage);
             _repeatCounts[m] = 0;