summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-29 18:25:24 +0100
committerErik Johnston <erik@matrix.org>2015-04-29 18:25:24 +0100
commitc27d6ad6b5eaed43f1f20530a51f48ca2931063f (patch)
treec30d83d55c9d52ed1d7e8c059337d30f0ae4131b /synapse/app
parentStart pushers on reactor thread (diff)
downloadsynapse-c27d6ad6b5eaed43f1f20530a51f48ca2931063f.tar.xz
Only start pushers when synapse has fully started
Diffstat (limited to 'synapse/app')
-rwxr-xr-xsynapse/app/homeserver.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 5c6812f473..0987a76cfc 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -442,11 +442,15 @@ def setup(config_options):
 
     hs.start_listening()
 
-    hs.get_pusherpool().start()
     hs.get_state_handler().start_caching()
     hs.get_datastore().start_profiling()
     hs.get_replication_layer().start_get_pdu_cache()
 
+    def on_start():
+        hs.get_pusherpool().start()
+
+    reactor.callWhenRunning(on_start)
+
     return hs