diff options
| author | Erik Johnston <erik@matrix.org> | 2020-03-25 09:42:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-25 09:42:39 +0000 |
| commit | b1cfaf08af436b8138cfb77b4283dbf5bacbaad2 (patch) | |
| tree | 59f98482e46e93876c6eb921a768297cd91ac95e | |
| parent | Clean up some LoggingContext stuff (#7120) (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-b1cfaf08af436b8138cfb77b4283dbf5bacbaad2.tar.xz | |
Merge pull request #7133 from matrix-org/erikj/fix_worker_startup
Fix starting workers when federation sending not split out.
| -rw-r--r-- | changelog.d/7133.bugfix | 1 | ||||
| -rw-r--r-- | synapse/app/generic_worker.py | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/changelog.d/7133.bugfix b/changelog.d/7133.bugfix new file mode 100644 index 0000000000..61a86fd34e --- /dev/null +++ b/changelog.d/7133.bugfix @@ -0,0 +1 @@ +Fix starting workers when federation sending not split out. diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py index c8fd8909a4..bd1733573b 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py @@ -875,6 +875,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: @@ -888,6 +891,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: @@ -901,6 +907,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: @@ -914,6 +923,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 |