kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startup

Browse Source
This commit is contained in:
Andrew Morgan
2020-02-20 15:59:54 +00:00
parent 65c59f31bb 3039be82ce
commit d3d29fd596
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5848.feature Normal file
View File

@@ -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
synapse/config/repository.py
View File

@@ -93,7 +93,7 @@ class ContentRepositoryConfig(Config):
# 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