Fix logging output

The messagePattern given in the am-config.yaml is set as env variable
QT_MESSAGE_PATTERN. However this might be too late for the System UI
(the env variable is evaluated by Qt before it is set by appman), so
the pattern will be set explicitly with qSetMessagePattern.

Change-Id: Ie8c9858feb600cd2b03ed5d6f77874235e0a05df
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/common-lib/logging.cpp b/src/common-lib/logging.cpp
index f14629d0..24cc003d 100644
--- a/src/common-lib/logging.cpp
+++ b/src/common-lib/logging.cpp
@@ -334,11 +334,10 @@ void Logging::setFilterRules(const QStringList &rules)
 
 void Logging::setMessagePattern(const QString &pattern)
 {
-    if (!pattern.isEmpty()) {
-        if (!s_messagePatternDefined) {
-            qputenv("QT_MESSAGE_PATTERN", pattern.toLocal8Bit());
-            s_messagePatternDefined = true;
-        }
+    if (!pattern.isEmpty() && !s_messagePatternDefined) {
+        qputenv("QT_MESSAGE_PATTERN", pattern.toLocal8Bit()); // pass on to application processes, however for the
+        qSetMessagePattern(pattern);  // System UI this might be too late, so set pattern explicitly here.
+        s_messagePatternDefined = true;
     }
 }