Merge branch 'plugin_load_error_output' into 'master'

[buteo-syncfw] Output error string when plugin loading fails. Contributes to JB#53994 See merge request mer-core/buteo-syncfw!66
sailfishos · Apr 23, 2021 · 04ace1f · 04ace1f
2 parents 382548f + 9f0f93c
commit 04ace1f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/libbuteosyncfw/pluginmgr/SyncPluginBase.cpp b/libbuteosyncfw/pluginmgr/SyncPluginBase.cpp
@@ -21,6 +21,7 @@
  *
  */
 #include "SyncPluginBase.h"
+#include "SyncResults.h"
 #include "PluginCbInterface.h"
 
 using namespace Buteo;
@@ -33,6 +34,7 @@ SyncPluginBase::SyncPluginBase(const QString &aPluginName,
       iProfileName(aProfileName)
 {
     // register various metatypes used in DBus arguments
+    qRegisterMetaType<SyncResults::MinorCode>("SyncResults::MinorCode");
     qRegisterMetaType<Sync::SyncStatus>("Sync::SyncStatus");
     qRegisterMetaType<Sync::TransferDatabase>("Sync::TransferDatabase");
     qRegisterMetaType<Sync::TransferType>("Sync::TransferType");

diff --git a/msyncd/PluginRunner.cpp b/msyncd/PluginRunner.cpp
@@ -23,6 +23,7 @@
 
 #include "PluginRunner.h"
 #include "LogMacros.h"
+#include "SyncResults.h"
 
 using namespace Buteo;
 
@@ -38,6 +39,7 @@ PluginRunner::PluginRunner(PluginType aPluginType, const QString &aPluginName,
     FUNCTION_CALL_TRACE;
 
     // register various metatypes used in DBus arguments
+    qRegisterMetaType<SyncResults::MinorCode>("SyncResults::MinorCode");
     qRegisterMetaType<Sync::SyncStatus>("Sync::SyncStatus");
     qRegisterMetaType<Sync::TransferDatabase>("Sync::TransferDatabase");
     qRegisterMetaType<Sync::TransferType>("Sync::TransferType");

diff --git a/oopp-runner/PluginServiceObj.cpp b/oopp-runner/PluginServiceObj.cpp
@@ -61,8 +61,8 @@ SyncPluginBase *PluginServiceObj::initializePlugin()
 
     iSyncPluginLoader = qobject_cast<SyncPluginLoader *>(iPluginLoader->instance());
     if (!iSyncPluginLoader) {
-        LOG_WARNING("Unable to load SyncPluginLoader " << iPluginName
-                    << " from path " << iPluginFilePath);
+        LOG_WARNING("Unable to load SyncPluginLoader" << iPluginName << "from path" << iPluginFilePath)
+                << "Error:" << iPluginLoader->errorString();
         return nullptr;
     }