mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-23 01:55:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix starting workers when federation sending not split out.

Browse source
This commit is contained in:
Erik Johnston 2020-03-24 10:35:00 +00:00 committed by Andrew Morgan
parent 88bb6c27e1
commit db098ec994
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
synapse/app/generic_worker.py
View file

@ -860,6 +860,9 @@ def start(config_options):
# Force the appservice to start since they will be disabled in the main config # Force the appservice to start since they will be disabled in the main config
config.notify_appservices = True 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.worker_app == "synapse.app.pusher":
if config.start_pushers: 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 # Force the pushers to start since they will be disabled in the main config
config.start_pushers = True 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.worker_app == "synapse.app.user_dir":
if config.update_user_directory: 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 # Force the pushers to start since they will be disabled in the main config
config.update_user_directory = True 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.worker_app == "synapse.app.federation_sender":
if config.send_federation: 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 # Force the pushers to start since they will be disabled in the main config
config.send_federation = True 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 synapse.events.USE_FROZEN_DICTS = config.use_frozen_dicts