Merge lp:~renatofilho/buteo-syncfw/fix-1509053 into lp:~phablet-team/buteo-syncfw/ubuntu

[Renato Araujo Oliveira Filho]

Fixed OOP plugin initialization.

Wait until the OOP plugin service appear on DBUS, to continue plugin initialization.

Back port upstream change: https://git.merproject.org/mer-core/buteo-syncfw/commit/368d24a3ecea6c2b8ec2c823e4827d52cd62e1b0

[lp:~renatofilho/buteo-syncfw/fix-1509053]

283. By Renato Araujo Oliveira Filho on 2015-10-28

Updated patch based on upstream comments.

[Ken VanDine (ken-vandine)]

packaging is fine

review: Approve

=== added file 'debian/patches/0004-Fixed-OOP-plugin-initialization.patch'
--- debian/patches/0004-Fixed-OOP-plugin-initialization.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0004-Fixed-OOP-plugin-initialization.patch	2015-10-28 11:57:36 +0000
@@ -0,0 +1,49 @@
+diff --git a/libbuteosyncfw/pluginmgr/PluginManager.cpp b/libbuteosyncfw/pluginmgr/PluginManager.cpp
+index c66f537..b4a0cb8 100644
+--- a/libbuteosyncfw/pluginmgr/PluginManager.cpp
++++ b/libbuteosyncfw/pluginmgr/PluginManager.cpp
+@@ -658,13 +658,30 @@ QProcess* PluginManager::startOOPPlugin( const QString &aPath,
+     process->setProcessChannelMode( QProcess::ForwardedChannels );
+     process->start( aPath, args );
+ 
+-    // This check is a workaround for the bug https://codereview.qt-project.org/#change,62897
+-    QThread::sleep(1);         // The process state does not seem be in a proper state immediately
++    const QString clientPluginDBusServiceName(QStringLiteral("com.buteo.msyncd.plugin.profile-%1").arg(aProfileName));
++    const QString serverPluginDBusServiceName(QStringLiteral("com.buteo.msyncd.plugin.%1").arg(aProfileName));
++    bool pluginHasRegistered = false;
++    for (int i = 0; i < 30; i++) { // wait for up to thirty seconds for the process to register with dbus
++        QThread::sleep(1);         // sleep for a second to wait for the process to be scheduled, init and register with dbus
++        QDBusReply<bool> clientServiceRegistered = QDBusConnection::sessionBus().interface()->isServiceRegistered(clientPluginDBusServiceName);
++        if (clientServiceRegistered.isValid() && clientServiceRegistered.value()) {
++            pluginHasRegistered = true;
++            break;
++        }
++        QDBusReply<bool> serverServiceRegistered = QDBusConnection::sessionBus().interface()->isServiceRegistered(serverPluginDBusServiceName);
++        if (serverServiceRegistered.isValid() && serverServiceRegistered.value()) {
++            pluginHasRegistered = true;
++            break;
++        }
++    }
++
+     if( process->state() == QProcess::Starting ) {
+         started = process->waitForStarted();
++    } else {
++        started = process->state() == QProcess::Running;
+     }
+ 
+-    if (started == true) {
++    if (started) {
+         DllInfo info;
+         info.iPath = aPath;
+         info.iHandle = (void*)process;
+@@ -675,6 +692,10 @@ QProcess* PluginManager::startOOPPlugin( const QString &aPath,
+         iDllLock.unlock();
+ 
+         LOG_DEBUG( "Process " << process->program() << " started with pid " << process->pid() );
++        if (!pluginHasRegistered) {
++            LOG_DEBUG( "Process " << process->program() << " with pid " << process->pid() <<
++                       "was unable to register DBus service: " << clientPluginDBusServiceName << "|" << serverPluginDBusServiceName );
++        }
+         connect(process, SIGNAL(finished(int,QProcess::ExitStatus)),
+                 this, SLOT(onProcessFinished(int,QProcess::ExitStatus)));
+         return process;
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2015-09-22 16:15:11 +0000
+++ debian/patches/series	2015-10-28 11:57:36 +0000
@@ -3,3 +3,4 @@
 0002-Fixed-FUNCTION_CALL_TRACE-macro.patch
 0003-Added-upstart-service-file.patch
 0001-Check-for-WLAN-or-ETHERNET-connections.patch
+0004-Fixed-OOP-plugin-initialization.patch