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

Commit

Permalink
Merge pull request #7133 from matrix-org/erikj/fix_worker_startup
Browse files Browse the repository at this point in the history
Fix starting workers when federation sending not split out.
  • Loading branch information
erikjohnston authored Mar 25, 2020
2 parents 39230d2 + d6828c1 commit b1cfaf0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
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 @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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

Expand Down

0 comments on commit b1cfaf0

Please sign in to comment.