summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-29 18:22:20 +0100
committerErik Johnston <erik@matrix.org>2015-04-29 18:22:20 +0100
commit46daf2d2000ebaaec813c88e73183ca1a5e5e58e (patch)
treef89a8397320ec4a87aa837cd49c9d4e5483c93d6 /synapse
parentActually return rows (diff)
downloadsynapse-46daf2d2000ebaaec813c88e73183ca1a5e5e58e.tar.xz
Start pushers on reactor thread
Diffstat (limited to 'synapse')
-rw-r--r--synapse/push/pusherpool.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
index 571d8b2f82..2e58f70ffa 100644
--- a/synapse/push/pusherpool.py
+++ b/synapse/push/pusherpool.py
@@ -19,6 +19,8 @@ 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__)
@@ -48,6 +50,7 @@ class PusherPool:
 
     @defer.inlineCallbacks
     def start(self):
+        yield run_on_reactor()
         pushers = yield self.store.get_all_pushers()
         self._start_pushers(pushers)