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

Fix mediarepo worker startup #5848

Merged
merged 2 commits into from
Aug 13, 2019
Merged

Fix mediarepo worker startup #5848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18bdac8
fix config being a dict, actually
hawkowl Aug 13, 2019
28bce1a
changelog
hawkowl Aug 13, 2019
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/5848.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Synapse will no longer serve any media repo admin endpoints when `enable_media_repo` is set to False in the configuration. If a media repo worker is used, the admin APIs relating to the media repo will be served from it instead.
2 changes: 1 addition & 1 deletion synapse/config/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def read_config(self, config, **kwargs):
# current worker app is the media repo.
if (
self.enable_media_repo is False
and config.worker_app != "synapse.app.media_repository"
and config.get("worker_app") != "synapse.app.media_repository"
):
self.can_load_media_repo = False
return
Expand Down