Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix starting workers when federation sending not split out. #7133

Merged
merged 2 commits into from
Mar 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/7133.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix starting workers when federation sending not split out.
12 changes: 12 additions & 0 deletions synapse/app/generic_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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

Expand Down