diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-04-02 16:20:54 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-04-02 16:20:54 +0100 |
| commit | 84a901cf0c32650ccd14f3a3ecd03dabed16d554 (patch) | |
| tree | 0517aa612d9e8468dd853355fe225706c833d246 /synapse/app | |
| parent | Attempt to clarify Python version requirements (#7161) (diff) | |
| parent | 1.12.1 (diff) | |
| download | synapse-84a901cf0c32650ccd14f3a3ecd03dabed16d554.tar.xz | |
Merge tag 'v1.12.1'
Synapse 1.12.1 (2020-04-02) =========================== No significant changes since 1.12.1rc1. Synapse 1.12.1rc1 (2020-03-31) ============================== Bugfixes -------- - Fix starting workers when federation sending not split out. ([\#7133](https://github.com/matrix-org/synapse/issues/7133)). Introduced in v1.12.0. - Avoid importing `sqlite3` when using the postgres backend. Contributed by David Vo. ([\#7155](https://github.com/matrix-org/synapse/issues/7155)). Introduced in v1.12.0rc1. - Fix a bug which could cause outbound federation traffic to stop working if a client uploaded an incorrect e2e device signature. ([\#7177](https://github.com/matrix-org/synapse/issues/7177)). Introduced in v1.11.0. * tag 'v1.12.1': 1.12.1 Note where bugs were introduced 1.12.1rc1 Newsfile Rewrite changelog Add changelog Only import sqlite3 when type checking Fix another instance Only setdefault for signatures if device has key_json Fix starting workers when federation sending not split out.
Diffstat (limited to 'synapse/app')
| -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 |