diff options
| author | Erik Johnston <erik@matrix.org> | 2020-03-24 10:35:00 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-03-24 10:35:00 +0000 |
| commit | c816072d47c16d2840116418698d95a855f0f24c (patch) | |
| tree | a36bf7795e45629cd9bf9923a9f09e8d6cba46e0 | |
| parent | Merge tag 'v1.12.0' (diff) | |
| download | synapse-c816072d47c16d2840116418698d95a855f0f24c.tar.xz | |
Fix starting workers when federation sending not split out.
| -rw-r--r-- | synapse/app/generic_worker.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py index b2c764bfe8..5363642d64 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py @@ -860,6 +860,9 @@ def start(config_options): # Force the appservice to start since they will be disabled in the main config config.notify_appservices = True + else: + # For other worker types we force this to off. + config.notify_appservices = False if config.worker_app == "synapse.app.pusher": if config.start_pushers: @@ -873,6 +876,9 @@ def start(config_options): # Force the pushers to start since they will be disabled in the main config config.start_pushers = True + else: + # For other worker types we force this to off. + config.start_pushers = False if config.worker_app == "synapse.app.user_dir": if config.update_user_directory: @@ -886,6 +892,9 @@ def start(config_options): # Force the pushers to start since they will be disabled in the main config config.update_user_directory = True + else: + # For other worker types we force this to off. + config.update_user_directory = False if config.worker_app == "synapse.app.federation_sender": if config.send_federation: @@ -899,6 +908,9 @@ def start(config_options): # Force the pushers to start since they will be disabled in the main config config.send_federation = True + else: + # For other worker types we force this to off. + config.send_federation = False synapse.events.USE_FROZEN_DICTS = config.use_frozen_dicts |