Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only start pushers when synapse has fully started

Browse Source
This commit is contained in:
Erik Johnston 2015-04-29 18:25:24 +01:00
parent 46daf2d200
commit c27d6ad6b5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/app/homeserver.py
View File

@ -442,11 +442,15 @@ def setup(config_options):
hs.start_listening() hs.start_listening()
hs.get_pusherpool().start()
hs.get_state_handler().start_caching() hs.get_state_handler().start_caching()
hs.get_datastore().start_profiling() hs.get_datastore().start_profiling()
hs.get_replication_layer().start_get_pdu_cache() hs.get_replication_layer().start_get_pdu_cache()
def on_start():
hs.get_pusherpool().start()
reactor.callWhenRunning(on_start)
return hs return hs

3
synapse/push/pusherpool.py
View File

@ -19,8 +19,6 @@ from twisted.internet import defer
from httppusher import HttpPusher from httppusher import HttpPusher
from synapse.push import PusherConfigException from synapse.push import PusherConfigException
from synapse.util.async import run_on_reactor
import logging import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -50,7 +48,6 @@ class PusherPool:
@defer.inlineCallbacks @defer.inlineCallbacks
def start(self): def start(self):
yield run_on_reactor()
pushers = yield self.store.get_all_pushers() pushers = yield self.store.get_all_pushers()
self._start_pushers(pushers) self._start_pushers(pushers)