summary refs log tree commit diff
path: root/synapse/app/synchrotron.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-02-13 10:29:31 +0000
committerErik Johnston <erik@matrix.org>2019-02-13 10:29:31 +0000
commit341c35614a9c46f2c03d69e7be1d33f0d21ae8ba (patch)
treefb6ab41d62e3d8fa9508bae9a71202b7b9d3ef6f /synapse/app/synchrotron.py
parentMerge branch 'release-v0.99.0' into matrix-org-hotfixes (diff)
parentFixup changelog (diff)
downloadsynapse-341c35614a9c46f2c03d69e7be1d33f0d21ae8ba.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/synchrotron.py')
-rw-r--r--synapse/app/synchrotron.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py

index 0354e82bf8..9163b56d86 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py
@@ -445,12 +445,7 @@ def start(config_options): ) ss.setup() - ss.start_listening(config.worker_listeners) - - def start(): - ss.get_datastore().start_profiling() - - reactor.callWhenRunning(start) + reactor.callWhenRunning(_base.start, ss, config.worker_listeners) _base.start_worker_reactor("synapse-synchrotron", config)