From: Jocelyn Turcotte <jturcotte@woboq.com>
Date: Tue, 28 Mar 2017 13:56:07 +0000 (+0200)
Subject: Improve the logging message pattern
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~736
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3a193655b3bdb9634c753e9e7b73a56469249655;p=nextcloud-desktop.git

Improve the logging message pattern

Add the log level and category name in the output. Only output the
thread ID and function name for qCDebug statements as they are not
necessary for general use and make the log harder to read.

Also make sure that the message pattern is set when NO_MSG_HANDLER is
used. Using an environment variable should have priority over it anyway.
---

diff --git a/src/libsync/logger.cpp b/src/libsync/logger.cpp
index 358887a72..1aad3feef 100644
--- a/src/libsync/logger.cpp
+++ b/src/libsync/logger.cpp
@@ -67,10 +67,10 @@ Logger *Logger::instance()
 Logger::Logger( QObject* parent) : QObject(parent),
   _showTime(true), _logWindowActivated(false), _doFileFlush(false), _logExpire(0)
 {
-#ifndef NO_MSG_HANDLER
 #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-    qSetMessagePattern("%{time MM-dd hh:mm:ss:zzz} %{threadid} %{function}: %{message}");
+    qSetMessagePattern("%{time MM-dd hh:mm:ss:zzz} [ %{type} %{category} ]%{if-debug}\t[ %{function} ]%{endif}:\t%{message}");
 #endif
+#ifndef NO_MSG_HANDLER
     qInstallMessageHandler(mirallLogCatcher);
 #else
     Q_UNUSED(mirallLogCatcher)