Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-08 18:15:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Olivier Wilkinson (reivilibre) 2020-07-30 15:18:36 +01:00
commit 3aa36b782c
17 changed files with 463 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/app/generic_worker.py
View file

@ -940,7 +940,7 @@ def start(config_options):
config.server.update_user_directory = False
if config.worker_app == "synapse.app.federation_sender":
if config.federation.send_federation:
if config.worker.send_federation:
sys.stderr.write(
"\nThe send_federation must be disabled in the main synapse process"
"\nbefore they can be run in a separate worker."
@ -950,10 +950,10 @@ def start(config_options):
sys.exit(1)
# Force the pushers to start since they will be disabled in the main config
config.federation.send_federation = True
config.worker.send_federation = True
else:
# For other worker types we force this to off.
config.federation.send_federation = False
config.worker.send_federation = False
synapse.events.USE_FROZEN_DICTS = config.use_frozen_dicts