summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-08-13 17:38:11 +0100
committerGitHub <noreply@github.com>2019-08-13 17:38:11 +0100
commit3039be82ce028304bfab27919919ff920b9c9363 (patch)
tree478615a9a7b850a099a6d3ff2a6e2c4b536c4007 /synapse
parentMerge pull request #5809 from matrix-org/erikj/handle_pusher_stop (diff)
parentchangelog (diff)
downloadsynapse-3039be82ce028304bfab27919919ff920b9c9363.tar.xz
Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startup
Fix mediarepo worker startup
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/repository.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/repository.py b/synapse/config/repository.py
index db39697e45..fdb1f246d0 100644
--- a/synapse/config/repository.py
+++ b/synapse/config/repository.py
@@ -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