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/media_repository.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/media_repository.py')
| -rw-r--r-- | synapse/app/media_repository.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py index f54beeb15d..c4e5f0965d 100644 --- a/synapse/app/media_repository.py +++ b/synapse/app/media_repository.py @@ -150,6 +150,13 @@ def start(config_options): assert config.worker_app == "synapse.app.media_repository" + if config.enable_media_repo: + _base.quit_with_error( + "enable_media_repo must be disabled in the main synapse process\n" + "before the media repo can be run in a separate worker.\n" + "Please add ``enable_media_repo: false`` to the main config\n" + ) + setup_logging(config, use_worker_options=True) events.USE_FROZEN_DICTS = config.use_frozen_dicts |