ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add better messages when failing to load a plugin

Browse Source
This commit is contained in:
Michael Zanetti 2020-04-04 23:18:10 +02:00
parent 9af820b696
commit 46245a2a6b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libnymea-core/integrations/thingmanagerimplementation.cpp
View File

@ -1078,9 +1078,14 @@ void ThingManagerImplementation::loadPlugins()
// Check plugin API version compatibility // Check plugin API version compatibility
QLibrary lib(fi.absoluteFilePath()); QLibrary lib(fi.absoluteFilePath());
if (!lib.load()) {
qCWarning(dcThingManager()).nospace() << "Error loading plugin " << fi.absoluteFilePath() << ": " << lib.errorString();
continue;
}
QFunctionPointer versionFunc = lib.resolve("libnymea_api_version"); QFunctionPointer versionFunc = lib.resolve("libnymea_api_version");
if (!versionFunc) { if (!versionFunc) {
qCWarning(dcThingManager()).nospace() << "Unable to resolve version in plugin " << entry << ". Not loading plugin."; qCWarning(dcThingManager()).nospace() << "Unable to resolve version in plugin " << fi.absoluteFilePath() << ". Not loading plugin.";
lib.unload(); lib.unload();
continue; continue;
} }
@ -1090,7 +1095,7 @@ void ThingManagerImplementation::loadPlugins()
QStringList parts = version.split('.'); QStringList parts = version.split('.');
QStringList coreParts = QString(LIBNYMEA_API_VERSION).split('.'); QStringList coreParts = QString(LIBNYMEA_API_VERSION).split('.');
if (parts.length() != 3 || parts.at(0).toInt() != coreParts.at(0).toInt() || parts.at(1).toInt() > coreParts.at(1).toInt()) { if (parts.length() != 3 || parts.at(0).toInt() != coreParts.at(0).toInt() || parts.at(1).toInt() > coreParts.at(1).toInt()) {
qCWarning(dcThingManager()).nospace() << "Libnymea API mismatch for " << entry << ". Core API: " << LIBNYMEA_API_VERSION << ", Plugin API: " << version; qCWarning(dcThingManager()).nospace() << "Libnymea API mismatch for " << fi.absoluteFilePath() << ". Core API: " << LIBNYMEA_API_VERSION << ", Plugin API: " << version;
continue; continue;
} }