diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-08-13 17:38:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-13 17:38:11 +0100 |
| commit | 3039be82ce028304bfab27919919ff920b9c9363 (patch) | |
| tree | 478615a9a7b850a099a6d3ff2a6e2c4b536c4007 | |
| parent | Merge pull request #5809 from matrix-org/erikj/handle_pusher_stop (diff) | |
| parent | changelog (diff) | |
| download | synapse-3039be82ce028304bfab27919919ff920b9c9363.tar.xz | |
Merge pull request #5848 from matrix-org/hawkowl/fix-mediarepo-worker-startup
Fix mediarepo worker startup
| -rw-r--r-- | changelog.d/5848.feature | 1 | ||||
| -rw-r--r-- | synapse/config/repository.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/5848.feature b/changelog.d/5848.feature new file mode 100644 index 0000000000..c1a09a4dce --- /dev/null +++ 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. \ No newline at end of file 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 |