diff options
author | Dominik Holland <dominik.holland@pelagicore.com> | 2019-09-03 12:05:20 +0200 |
---|---|---|
committer | Dominik Holland <dominik.holland@pelagicore.com> | 2019-09-03 21:00:55 +0200 |
commit | ff4bc7cbaf5827736fda4b1a8c85fcdd351680c1 (patch) | |
tree | 3a9a0f112348db6e591f0332ac12b4f5e51790fc | |
parent | 4ae1c55c4776c0c5465ddc5a7142c346b42f305d (diff) | |
download | qtapplicationmanager-ff4bc7cbaf5827736fda4b1a8c85fcdd351680c1.tar.gz |
Revert "Add a option to configure the behavior of very long log messages passed to DLT"v5.12.4_QtAS
This reverts commit 78beb6acca90fb2f2490e2b60d2103a25f1508fe.
This change was breaking SC and can't be released with a
patch release. The change will be put into the dev branch
instead.
Task-number: AUTOSUITE-1187
Change-Id: Iff07e290308c2464ab25c5ef17b1749ddfd85723
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
-rw-r--r-- | doc/configuration.qdoc | 8 | ||||
-rw-r--r-- | src/common-lib/common-lib.pro | 3 | ||||
-rw-r--r-- | src/common-lib/logging.cpp | 25 | ||||
-rw-r--r-- | src/common-lib/logging.h | 3 | ||||
-rw-r--r-- | src/launcher-lib/launchermain.cpp | 8 | ||||
-rw-r--r-- | src/launcher-lib/launchermain.h | 2 | ||||
-rw-r--r-- | src/main-lib/defaultconfiguration.cpp | 9 | ||||
-rw-r--r-- | src/main-lib/defaultconfiguration.h | 1 | ||||
-rw-r--r-- | src/main-lib/main.cpp | 1 | ||||
-rw-r--r-- | src/manager-lib/nativeruntime.cpp | 6 | ||||
-rw-r--r-- | src/tools/launcher-qml/launcher-qml.cpp | 2 |
11 files changed, 1 insertions, 67 deletions
diff --git a/doc/configuration.qdoc b/doc/configuration.qdoc index 3e625e8e..72aded9d 100644 --- a/doc/configuration.qdoc +++ b/doc/configuration.qdoc @@ -315,14 +315,6 @@ all your imports paths and file references relative to your main config file. augment the short DLT application id with a more verbose definition. Note that a default description is used until this configuration option has been applied. \row - \li \b - - \br \e logging/dlt/longMessageBehavior - \li string - \li Configures how very long messages (more than ~1000 characters) should be handled when using - automotive DLT. The default behavior is to truncate the message to the maximum possible - size. Other options are \c split to cut the message into several smaller messages, or - \c pass to pass it as is to DLT. -\row \li \b --no-dlt-logging \br \e - \li bool diff --git a/src/common-lib/common-lib.pro b/src/common-lib/common-lib.pro index 7faaa348..2ee3a8eb 100644 --- a/src/common-lib/common-lib.pro +++ b/src/common-lib/common-lib.pro @@ -13,9 +13,6 @@ qtHaveModule(qml):QT *= qml qml-private versionAtLeast(QT.geniviextras.VERSION, 1.1.0) { DEFINES += AM_GENIVIEXTRAS_LAZY_INIT } -versionAtLeast(QT.geniviextras.VERSION, 5.12.4) { - DEFINES += AM_GENIVIEXTRAS_MSG_BEHAVIOR -} CONFIG *= static internal_module diff --git a/src/common-lib/logging.cpp b/src/common-lib/logging.cpp index b4be7fed..f14629d0 100644 --- a/src/common-lib/logging.cpp +++ b/src/common-lib/logging.cpp @@ -122,7 +122,6 @@ QStringList Logging::s_rules; QtMessageHandler Logging::s_defaultQtHandler = nullptr; QByteArray Logging::s_applicationId = QByteArray(); QVariant Logging::s_useAMConsoleLoggerConfig = QVariant(); -QString Logging::s_dltLongMessageBehavior = QString(); static void colorLogToStderr(QtMsgType msgType, const QMessageLogContext &context, const QString &message) @@ -411,30 +410,6 @@ void Logging::setDltApplicationId(const QByteArray &dltAppId, const QByteArray & #endif } -QString Logging::dltLongMessageBehavior() -{ - return s_dltLongMessageBehavior; -} - -void Logging::setDltLongMessageBehavior(const QString &behaviorString) -{ -#if defined(AM_GENIVIEXTRAS_MSG_BEHAVIOR) - if (!s_dltEnabled) - return; - - s_dltLongMessageBehavior = behaviorString; - QDltRegistration::LongMessageBehavior behavior = QDltRegistration::LongMessageBehavior::Truncate; - if (behaviorString == qL1S("split")) - behavior = QDltRegistration::LongMessageBehavior::Split; - else if (behaviorString == qL1S("pass")) - behavior = QDltRegistration::LongMessageBehavior::Pass; - - globalDltRegistration()->setLongMessageBehavior(behavior); -#else - Q_UNUSED(behaviorString) -#endif -} - void Logging::logToDlt(QtMsgType msgType, const QMessageLogContext &context, const QString &message) { #if defined(QT_GENIVIEXTRAS_LIB) diff --git a/src/common-lib/logging.h b/src/common-lib/logging.h index b986f7a8..7671a6cb 100644 --- a/src/common-lib/logging.h +++ b/src/common-lib/logging.h @@ -79,8 +79,6 @@ public: static void registerUnregisteredDltContexts(); static void setSystemUiDltId(const QByteArray &dltAppId, const QByteArray &dltAppDescription); static void setDltApplicationId(const QByteArray &dltAppId, const QByteArray &dltAppDescription); - static QString dltLongMessageBehavior(); - static void setDltLongMessageBehavior(const QString &behaviorString); static void logToDlt(QtMsgType msgType, const QMessageLogContext &context, const QString &message); @@ -92,7 +90,6 @@ private: static QtMessageHandler s_defaultQtHandler; static QByteArray s_applicationId; static QVariant s_useAMConsoleLoggerConfig; - static QString s_dltLongMessageBehavior; }; void am_trace(QDebug); diff --git a/src/launcher-lib/launchermain.cpp b/src/launcher-lib/launchermain.cpp index e2be9e8a..5b573c4e 100644 --- a/src/launcher-lib/launchermain.cpp +++ b/src/launcher-lib/launchermain.cpp @@ -123,11 +123,6 @@ QVariant LauncherMain::useAMConsoleLogger() const return m_useAMConsoleLogger; } -QString LauncherMain::dltLongMessageBehavior() const -{ - return m_dltLongMessageBehavior; -} - QString LauncherMain::p2pDBusName() const { return qSL("am"); @@ -222,9 +217,6 @@ void LauncherMain::loadConfiguration(const QByteArray &configYaml) Q_DECL_NOEXCE m_iconThemeName = uiConfig.value(qSL("iconThemeName")).toString(); m_iconThemeSearchPaths = uiConfig.value(qSL("iconThemeSearchPaths")).toStringList(); - QVariantMap dltConfig = m_configuration.value(qSL("dlt")).toMap(); - m_dltLongMessageBehavior = uiConfig.value(qSL("longMessageBehavior")).toString(); - // un-comment this if things go south: //qWarning() << "### LOG " << m_loggingRules; //qWarning() << "### DBUS" << dbusConfig; diff --git a/src/launcher-lib/launchermain.h b/src/launcher-lib/launchermain.h index 2aca1a4f..7ff1dd31 100644 --- a/src/launcher-lib/launchermain.h +++ b/src/launcher-lib/launchermain.h @@ -86,7 +86,6 @@ public: QVariantMap systemProperties() const; QStringList loggingRules() const; QVariant useAMConsoleLogger() const; - QString dltLongMessageBehavior() const; QString p2pDBusName() const; QString notificationDBusName() const; @@ -121,7 +120,6 @@ private: QString m_iconThemeName; QStringList m_iconThemeSearchPaths; QVariant m_useAMConsoleLogger; - QString m_dltLongMessageBehavior; WaylandQtAMClientExtension *m_waylandExtension = nullptr; }; diff --git a/src/main-lib/defaultconfiguration.cpp b/src/main-lib/defaultconfiguration.cpp index 24b32a83..b3469534 100644 --- a/src/main-lib/defaultconfiguration.cpp +++ b/src/main-lib/defaultconfiguration.cpp @@ -148,10 +148,6 @@ void DefaultConfiguration::parseWithArguments(const QStringList &arguments, QStr *deploymentWarnings << qL1S("No --installed-apps-manifest-dir command line parameter or" " applications/installedAppsManifestDir configuration key specified. It won't be possible to install," " remove or access installable applications."); - - static const QStringList validDltLMBValues({qL1S("split"), qL1S("truncate"), qL1S("pass")}); - if (!dltLongMessageBehavior().isEmpty() && !validDltLMBValues.contains(dltLongMessageBehavior())) - *deploymentWarnings << qL1S("Invalid dltLongMessageBehavior"); } QString DefaultConfiguration::mainQmlFile() const @@ -349,11 +345,6 @@ QString DefaultConfiguration::dltDescription() const return value<QString>(nullptr, { "logging", "dlt", "description" }); } -QString DefaultConfiguration::dltLongMessageBehavior() const -{ - return value<QString>(nullptr, { "logging", "dlt", "longMessageBehavior" }); -} - QVariantMap DefaultConfiguration::openGLConfiguration() const { return value<QVariant>(nullptr, { "ui", "opengl" }).toMap(); diff --git a/src/main-lib/defaultconfiguration.h b/src/main-lib/defaultconfiguration.h index 10382c7b..0a21394f 100644 --- a/src/main-lib/defaultconfiguration.h +++ b/src/main-lib/defaultconfiguration.h @@ -96,7 +96,6 @@ public: bool enableTouchEmulation() const; QString dltId() const; QString dltDescription() const; - QString dltLongMessageBehavior() const; QVariantMap openGLConfiguration() const; diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp index 7013a898..37fcf4a7 100644 --- a/src/main-lib/main.cpp +++ b/src/main-lib/main.cpp @@ -210,7 +210,6 @@ void Main::setup(const DefaultConfiguration *cfg, const QStringList &deploymentW setupQmlDebugging(cfg->qmlDebugging()); if (!cfg->dltId().isEmpty() || !cfg->dltDescription().isEmpty()) Logging::setSystemUiDltId(cfg->dltId().toLocal8Bit(), cfg->dltDescription().toLocal8Bit()); - Logging::setDltLongMessageBehavior(cfg->dltLongMessageBehavior()); Logging::registerUnregisteredDltContexts(); // dump accumulated warnings, now that logging rules are set diff --git a/src/manager-lib/nativeruntime.cpp b/src/manager-lib/nativeruntime.cpp index d52e5688..3c1865b6 100644 --- a/src/manager-lib/nativeruntime.cpp +++ b/src/manager-lib/nativeruntime.cpp @@ -259,12 +259,8 @@ bool NativeRuntime::start() { qSL("org.freedesktop.Notifications"), NotificationManager::instance()->property("_am_dbus_name").toString()} }; - QVariantMap dltConfig = { - { qSL("longMessageBehavior"), Logging::dltLongMessageBehavior() } - }; - QVariantMap loggingConfig = { - { qSL("dlt"), dltConfig }, + { qSL("dlt"), Logging::isDltEnabled() }, { qSL("rules"), Logging::filterRules() }, { qSL("useAMConsoleLogger"), Logging::useAMConsoleLogger() } }; diff --git a/src/tools/launcher-qml/launcher-qml.cpp b/src/tools/launcher-qml/launcher-qml.cpp index 2ad635da..7b25117f 100644 --- a/src/tools/launcher-qml/launcher-qml.cpp +++ b/src/tools/launcher-qml/launcher-qml.cpp @@ -150,8 +150,6 @@ int main(int argc, char *argv[]) a.setupIconTheme(a.iconThemeSearchPaths(), a.iconThemeName()); a.registerWaylandExtensions(); - Logging::setDltLongMessageBehavior(a.dltLongMessageBehavior()); - StartupTimer::instance()->checkpoint("after basic initialization"); if (!directLoad.isEmpty()) { |