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

…-startup Fix mediarepo worker startup
matrix-org · Aug 13, 2019 · 3039be8 · 3039be8
2 parents af18780 + 28bce1a
commit 3039be8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/5848.feature b/changelog.d/5848.feature
@@ -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.
diff --git a/synapse/config/repository.py b/synapse/config/repository.py
@@ -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
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.