summary refs log tree commit diff
path: root/synapse/push
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/push
parentStart pushers on reactor thread (diff)
downloadsynapse-c27d6ad6b5eaed43f1f20530a51f48ca2931063f.tar.xz
Only start pushers when synapse has fully started
Diffstat (limited to '')
-rw-r--r--synapse/push/pusherpool.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index 2e58f70ffa..571d8b2f82 100644
--- a/synapse/push/pusherpool.py
+++ b/synapse/push/pusherpool.py
@@ -19,8 +19,6 @@ from twisted.internet import defer
 from httppusher import HttpPusher
 from synapse.push import PusherConfigException
 
-from synapse.util.async import run_on_reactor
-
 import logging
 
 logger = logging.getLogger(__name__)
@@ -50,7 +48,6 @@ class PusherPool:
 
     @defer.inlineCallbacks
     def start(self):
-        yield run_on_reactor()
         pushers = yield self.store.get_all_pushers()
         self._start_pushers(pushers)