diff options
author | Krombel <krombel@krombel.de> | 2018-03-28 14:45:28 +0200 |
---|---|---|
committer | Krombel <krombel@krombel.de> | 2018-03-28 14:45:28 +0200 |
commit | 6152e253d842eb4f72be975850450f00c0662e43 (patch) | |
tree | 5fa7c6cef720825e05076190c7d0e1f45565a4b5 /synapse/app/federation_reader.py | |
parent | move handling of auto_join_rooms to RegisterHandler (diff) | |
parent | Merge pull request #3042 from matrix-org/fix_locally_failing_tests (diff) | |
download | synapse-6152e253d842eb4f72be975850450f00c0662e43.tar.xz |
Merge branch 'develop' of into allow_auto_join_rooms
Diffstat (limited to 'synapse/app/federation_reader.py')
-rw-r--r-- | synapse/app/federation_reader.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py index 20d157911b..c1dc66dd17 100644 --- a/synapse/app/federation_reader.py +++ b/synapse/app/federation_reader.py @@ -41,7 +41,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.federation_reader") @@ -77,7 +77,7 @@ class FederationReaderServer(HomeServer): FEDERATION_PREFIX: TransportLayerServer(self), }) - root_resource = create_resource_tree(resources, Resource()) + root_resource = create_resource_tree(resources, NoResource()) _base.listen_tcp( bind_addresses, |