From a52e2d8bc56bce0327a9968885a136a07b3dfe01 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Sun, 2 Oct 2016 21:19:53 -0700 Subject: [PATCH 1/2] Add category to log lines --- libraries/shared/src/LogHandler.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/shared/src/LogHandler.cpp b/libraries/shared/src/LogHandler.cpp index b67c86ecef..a0efdee2a8 100644 --- a/libraries/shared/src/LogHandler.cpp +++ b/libraries/shared/src/LogHandler.cpp @@ -137,9 +137,10 @@ QString LogHandler::printMessage(LogMsgType type, const QMessageLogContext& cont dateFormatPtr = &DATE_STRING_FORMAT_WITH_MILLISECONDS; } - QString prefixString = QString("[%1]").arg(QDateTime::currentDateTime().toString(*dateFormatPtr)); + QString prefixString = QString("[%1] [%2] [%3]").arg(QDateTime::currentDateTime().toString(*dateFormatPtr), + stringForLogType(type), context.category); - prefixString.append(QString(" [%1]").arg(stringForLogType(type))); + //prefixString.append(QString(" [%1]").arg(stringForLogType(type))); if (_shouldOutputProcessID) { prefixString.append(QString(" [%1]").arg(QCoreApplication::instance()->applicationPid())); From 2bb2aca2beac896dec09ca7255b141c2a947c287 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 4 Oct 2016 16:54:37 -0700 Subject: [PATCH 2/2] Remove commented line in LogHandler --- libraries/shared/src/LogHandler.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/libraries/shared/src/LogHandler.cpp b/libraries/shared/src/LogHandler.cpp index a0efdee2a8..f003506aa7 100644 --- a/libraries/shared/src/LogHandler.cpp +++ b/libraries/shared/src/LogHandler.cpp @@ -140,8 +140,6 @@ QString LogHandler::printMessage(LogMsgType type, const QMessageLogContext& cont QString prefixString = QString("[%1] [%2] [%3]").arg(QDateTime::currentDateTime().toString(*dateFormatPtr), stringForLogType(type), context.category); - //prefixString.append(QString(" [%1]").arg(stringForLogType(type))); - if (_shouldOutputProcessID) { prefixString.append(QString(" [%1]").arg(QCoreApplication::instance()->applicationPid())); }