summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-29 18:37:30 +0100
committerErik Johnston <erik@matrix.org>2015-04-29 18:37:30 +0100
commite7a6edb0ee34a72ce5781802744ff6149ff6a940 (patch)
tree6cbca878890a0a7bb0098adf4293056759a013f3
parentOnly start pushers when synapse has fully started (diff)
downloadsynapse-e7a6edb0ee34a72ce5781802744ff6149ff6a940.tar.xz
Revert previous
Diffstat (limited to '')
-rwxr-xr-xsynapse/app/homeserver.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 0987a76cfc..5c6812f473 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -442,15 +442,11 @@ 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