diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-11-21 13:29:39 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-11-22 16:20:27 +0000 |
| commit | 68ca8641419ee42606192787b92152353f5c112e (patch) | |
| tree | 6bbaf289bb72c86a5d1002f69934bd6f20e0ad29 /synapse/app/homeserver.py | |
| parent | Build MediaRepositoryResource as a homeserver dependency (diff) | |
| download | synapse-68ca8641419ee42606192787b92152353f5c112e.tar.xz | |
Add config option to disable media_repo on main synapse
... to stop us doing the cache cleanup jobs on the master.
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 4b6164baa2..6b8875afb4 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -194,14 +194,19 @@ class SynapseHomeServer(HomeServer): }) if name in ["media", "federation", "client"]: - media_repo = self.get_media_repository_resource() - resources.update({ - MEDIA_PREFIX: media_repo, - LEGACY_MEDIA_PREFIX: media_repo, - CONTENT_REPO_PREFIX: ContentRepoResource( - self, self.config.uploads_path - ), - }) + if self.get_config().enable_media_repo: + media_repo = self.get_media_repository_resource() + resources.update({ + MEDIA_PREFIX: media_repo, + LEGACY_MEDIA_PREFIX: media_repo, + CONTENT_REPO_PREFIX: ContentRepoResource( + self, self.config.uploads_path + ), + }) + elif name == "media": + raise ConfigError( + "'media' resource conflicts with enable_media_repo=False", + ) if name in ["keys", "federation"]: resources.update({ |