From d4ab06b1d4b95df3ede52eac8c8ecd9190f17dc1 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Tue, 3 Apr 2018 15:53:12 -0700
Subject: [PATCH] Move HIFI_FDEBUG macro to LogHandler.h

Not all uses of repeated log messages include NetworkLogging.h,
but if they use addRepeatedMessageRegex() they must include
LogHandler.h. Also add second macro for client-supplied
message ID.
---
 libraries/networking/src/NetworkLogging.h | 12 ------------
 libraries/shared/src/LogHandler.h         | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/libraries/networking/src/NetworkLogging.h b/libraries/networking/src/NetworkLogging.h
index fa2b24462a..518c600efe 100644
--- a/libraries/networking/src/NetworkLogging.h
+++ b/libraries/networking/src/NetworkLogging.h
@@ -20,16 +20,4 @@ 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(__FILE__, \
-                __LINE__, __func__, category().categoryName()), logString_); \
-        } \
-    } while (false)
-
 #endif // hifi_NetworkLogging_h
diff --git a/libraries/shared/src/LogHandler.h b/libraries/shared/src/LogHandler.h
index 7b459538ad..8ca8158ec0 100644
--- a/libraries/shared/src/LogHandler.h
+++ b/libraries/shared/src/LogHandler.h
@@ -89,4 +89,27 @@ private:
     static QMutex _mutex;
 };
 
+#define HIFI_FDEBUG(category, message) \
+    do { \
+        if (category().isDebugEnabled()) { \
+            static int repeatedMessageID_ = LogHandler::getInstance().newRepeatedMessageID(); \
+            QString logString_; \
+            QDebug debugStringReceiver_(&logString_); \
+            debugStringReceiver_ << message; \
+            LogHandler::getInstance().printRepeatedMessage(repeatedMessageID_, LogDebug, QMessageLogContext(__FILE__, \
+                __LINE__, __func__, category().categoryName()), logString_); \
+        } \
+    } while (false)
+
+#define HIFI_FDEBUG_ID(category, messageID, message) \
+    do { \
+        if (category().isDebugEnabled()) { \
+            QString logString_; \
+            QDebug debugStringReceiver_(&logString_); \
+            debugStringReceiver_ << message; \
+            LogHandler::getInstance().printRepeatedMessage(messageID, LogDebug, QMessageLogContext(__FILE__, \
+                __LINE__, __func__, category().categoryName()), logString_); \
+        } \
+    } while (false)
+
 #endif // hifi_LogHandler_h