diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-05-29 00:25:22 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-05-29 00:25:22 +0100 |
| commit | 7a6df013cc8a128278d2ce7e5eb569e0b424f9b0 (patch) | |
| tree | 5de624a65953eb96ab67274462d850a88c0cce3c /synapse/app/media_repository.py | |
| parent | make lazy_load_members configurable in filters (diff) | |
| parent | Merge pull request #3256 from matrix-org/3218-official-prom (diff) | |
| download | synapse-7a6df013cc8a128278d2ce7e5eb569e0b424f9b0.tar.xz | |
merge develop
Diffstat (limited to 'synapse/app/media_repository.py')
| -rw-r--r-- | synapse/app/media_repository.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py index 84c5791b3b..9c93195f0a 100644 --- a/synapse/app/media_repository.py +++ b/synapse/app/media_repository.py @@ -43,7 +43,7 @@ from synapse.util.logcontext import LoggingContext from synapse.util.manhole import manhole from synapse.util.versionstring import get_version_string from twisted.internet import reactor -from twisted.web.resource import Resource +from twisted.web.resource import NoResource logger = logging.getLogger("synapse.app.media_repository") @@ -84,7 +84,7 @@ class MediaRepositoryServer(HomeServer): ), }) - root_resource = create_resource_tree(resources, Resource()) + root_resource = create_resource_tree(resources, NoResource()) _base.listen_tcp( bind_addresses, @@ -94,6 +94,7 @@ class MediaRepositoryServer(HomeServer): site_tag, listener_config, root_resource, + self.version_string, ) ) |