summary refs log tree commit diff
path: root/synapse/app/pusher.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-30 10:12:13 +0100
committerErik Johnston <erik@matrix.org>2019-07-30 10:12:13 +0100
commit65fe31786d6a8c008084161a9445367edbe38f51 (patch)
tree19bb742970e152ea2004bede0198a06034bd3865 /synapse/app/pusher.py
parentMerge branch 'release-v1.2.0' of github.com:matrix-org/synapse into matrix-or... (diff)
parentMerge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_state (diff)
downloadsynapse-65fe31786d6a8c008084161a9445367edbe38f51.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/pusher.py')
-rw-r--r--synapse/app/pusher.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py

index 070de7d0b0..692ffa2f04 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py
@@ -216,7 +216,7 @@ def start(config_options): _base.start(ps, config.worker_listeners) ps.get_pusherpool().start() - reactor.callWhenRunning(start) + reactor.addSystemEventTrigger("before", "startup", start) _base.start_worker_reactor("synapse-pusher", config)