Changes: Warn when an application extension fails to load, instantiate or initialize to help debugging application extensions

RevBy: TrustMe

2 files changed, 14 insertions, 7 deletions

diff --git a/mapplicationextensionrunner/main.cpp b/mapplicationextensionrunner/main.cpp
index 1107c078..a5736794 100644
--- a/mapplicationextensionrunner/main.cpp
+++ b/mapplicationextensionrunner/main.cpp
@@ -35,8 +35,8 @@
 #include "mapplicationextensionrunner.h"
 #include <MApplication>
 #include <MApplicationService>
+#include <MDebug>
 #include <QPluginLoader>
-#include <QDebug>
 #include <mapplicationextensionmetadata.h>
 
 /// Error code for initialization failure
@@ -56,7 +56,6 @@ public:
     }
 
     virtual void handleServiceRegistrationFailure() {
-        qDebug() << "MyApplicationService::handleServiceRegistrationFailure()";
     }
 
     virtual QString registeredName() {
@@ -82,21 +81,25 @@ int main(int argc, char **argv)
 {
     // Check for correct number of arguments
     if (argc != 3) {
-        qWarning() << "Invalid number of arguments";
+        mWarning("MApplicationExtensionRunner") << "Invalid number of arguments";
         return ERROR_INVALID_ARGUMENTS;
     }
 
     // Load metadata
     MApplicationExtensionMetaData metadata(argv[2]);
     if (!metadata.isValid()) {
-        qWarning() << "Metadata " << argv[2] << "is not valid";
+        mWarning("MApplicationExtensionRunner") << "Application extension" << argv[2] << "metadata is not valid.";
         return ERROR_APPLICATION_EXTENSION_INIT_FAILED;
     }
 
+    // Set the output level to warning to help debugging
+    if (getenv("M_OUTPUT_LEVEL") == NULL) {
+        setenv("M_OUTPUT_LEVEL", "warning", 0);
+    }
     MApplication *app = new MApplication(argc, argv, metadata.resourceIdentifier(), new MyApplicationService());
     MApplicationExtensionRunner runner;
     if (!runner.init(argv[1], metadata)) {
-        qWarning() << "Application extension initialization failed";
+        mWarning("MApplicationExtensionRunner") << "Application extension" << argv[2] << "initialization failed.";
         return ERROR_APPLICATION_EXTENSION_INIT_FAILED;
     }
 
diff --git a/mapplicationextensionrunner/mapplicationextensionrunner.cpp b/mapplicationextensionrunner/mapplicationextensionrunner.cpp
index e5bf98da..25e5d851 100644
--- a/mapplicationextensionrunner/mapplicationextensionrunner.cpp
+++ b/mapplicationextensionrunner/mapplicationextensionrunner.cpp
@@ -23,7 +23,7 @@
 #include <mapplicationextensioninterface.h>
 #include <QGraphicsLinearLayout>
 #include <QGraphicsWidget>
-#include <QDebug>
+#include <MDebug>
 
 MApplicationExtensionRunner::MApplicationExtensionRunner() :
         MExtensionRunner(),
@@ -39,7 +39,7 @@ bool MApplicationExtensionRunner::init(const QString &serverName, MApplicationEx
 {
     // Check whether the metadata is valid
     if (!metaData.isValid()) {
-        qWarning() << "Extension metadata is not valid.";
+        mWarning("MApplicationExtensionRunner") << "Application extension" << metaData.fileName() << "metadata is not valid.";
         return false;
     }
 
@@ -57,7 +57,11 @@ bool MApplicationExtensionRunner::init(const QString &serverName, MApplicationEx
                     success = true;
                 }
             }
+        } else {
+            mWarning("MApplicationExtensionRunner") << "Application extension" << metaData.fileName() << "could not be loaded.";
         }
+    } else {
+        mWarning("MApplicationExtensionRunner") << "Application extension" << metaData.fileName() << "could not be initialized.";
     }
 
     return success;