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

Commit d3d29fd

Browse files
committed
Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startup
2 parents 65c59f3 + 3039be8 commit d3d29fd

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

changelog.d/5848.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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.

synapse/config/repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def read_config(self, config, **kwargs):
9393
# current worker app is the media repo.
9494
if (
9595
self.enable_media_repo is False
96-
and config.worker_app != "synapse.app.media_repository"
96+
and config.get("worker_app") != "synapse.app.media_repository"
9797
):
9898
self.can_load_media_repo = False
9999
return

0 commit comments

Comments
 (0)