summaryrefslogtreecommitdiffstats
path: root/src/launcher-lib/launchermain.cpp
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2019-03-12 14:22:43 +0100
committerRobert Griebl <robert.griebl@pelagicore.com>2019-03-14 09:50:51 +0000
commit09f0e5808f039fc308e7d1f90dfb41c25383f040 (patch)
treeae8b426c3893271f61f194fdeb861d14a88c1477 /src/launcher-lib/launchermain.cpp
parentb3b7b3bbe1ae8a03e101fb1cd0417682d767b9f4 (diff)
Add more logging configuration options
* Introduce an option to configure the qtMessagePattern in the config.yaml * Add an option to configure whether the AM internal console logging function should be used. Change-Id: Ied5b08766072431384c0718529600b767d200bf7 Reviewed-by: Kavindra Palaraja <kpalaraja@luxoft.com> Reviewed-by: Michael Weyel <mweyel@luxoft.com> Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'src/launcher-lib/launchermain.cpp')
-rw-r--r--src/launcher-lib/launchermain.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/launcher-lib/launchermain.cpp b/src/launcher-lib/launchermain.cpp
index 358675fc..5b573c4e 100644
--- a/src/launcher-lib/launchermain.cpp
+++ b/src/launcher-lib/launchermain.cpp
@@ -118,6 +118,11 @@ QStringList LauncherMain::loggingRules() const
return m_loggingRules;
}
+QVariant LauncherMain::useAMConsoleLogger() const
+{
+ return m_useAMConsoleLogger;
+}
+
QString LauncherMain::p2pDBusName() const
{
return qSL("am");
@@ -200,6 +205,7 @@ void LauncherMain::loadConfiguration(const QByteArray &configYaml) Q_DECL_NOEXCE
QVariantMap loggingConfig = m_configuration.value(qSL("logging")).toMap();
m_loggingRules = variantToStringList(loggingConfig.value(qSL("rules")));
+ m_useAMConsoleLogger = loggingConfig.value(qSL("useAMConsoleLogger"));
QVariantMap dbusConfig = m_configuration.value(qSL("dbus")).toMap();
m_dbusAddressP2P = dbusConfig.value(qSL("p2p")).toString();