Merge lp:~robru/friends/early-dbus-interface into lp:friends

[Robert Bruce Park]

Bring up the DBus interface much sooner in the init process, no longer waiting for the model to sync before starting to listen for dbus methods.

[Robert Bruce Park (robru)]

Wow, I've only been running this for four hours, but so far it has completely obliterated all the timeout warnings I used to see. Really curious to see what this looks like for you, Ken.

=== modified file 'friends/main.py'
--- friends/main.py	2013-02-20 13:08:27 +0000
+++ friends/main.py	2013-03-01 20:32:21 +0000
@@ -57,10 +57,11 @@
 GObject.threads_init(None)
 
 from friends.service.dispatcher import Dispatcher, DBUS_INTERFACE
+from friends.utils.base import _OperationThread, _publish_lock
+from friends.utils.base import Base, initialize_caches
+from friends.utils.model import Model, prune_model
+from friends.utils.logging import initialize
 from friends.utils.avatar import Avatar
-from friends.utils.base import _OperationThread, Base, initialize_caches
-from friends.utils.logging import initialize
-from friends.utils.model import Model, prune_model
 
 
 # Optional performance profiling module.
@@ -126,8 +127,14 @@
             'private',
             )
 
+    # We need to acquire the publish lock so that the dispatcher
+    # doesn't try to publish rows into an uninitialized model...
+    # basically this prevents duplicates from showing up.
+    _publish_lock.acquire()
+    Dispatcher(gsettings, loop)
+
     # Don't initialize caches until the model is synchronized
-    Model.connect('notify::synchronized', setup, gsettings, loop)
+    Model.connect('notify::synchronized', setup)
 
     try:
         log.info('Starting friends-dispatcher main loop')
@@ -140,7 +147,7 @@
         yappi.print_stats(sys.stdout, yappi.SORTTYPE_TTOT)
 
 
-def setup(model, param, gsettings, loop):
+def setup(model, param):
     """Continue friends-dispatcher init after the DeeModel has synced."""
     # mhr3 says that we should not let a Dee.SharedModel exceed 8mb in
     # size, because anything larger will have problems being transmitted
@@ -156,7 +163,8 @@
     # data for the purposes of faster duplicate checks.
     initialize_caches()
 
-    Dispatcher(gsettings, loop)
+    # Allow publishing.
+    _publish_lock.release()
 
 
 if __name__ == '__main__':