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

Move HIFI_FDEBUG macro to LogHandler.h

Browse source 
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.
This commit is contained in:
Simon Walton 2018-04-03 15:53:12 -07:00
parent 5b0bcd76e3
commit d4ab06b1d4
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,16 +20,4 @@ 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(__FILE__, \
__LINE__, __func__, category().categoryName()), logString_); \
} \
} while (false)
#endif // hifi_NetworkLogging_h #endif // hifi_NetworkLogging_h

23
libraries/shared/src/LogHandler.h
View file

@ -89,4 +89,27 @@ private:
static QMutex _mutex; 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 #endif // hifi_LogHandler_h