summary refs log tree commit diff
path: root/synapse/app/federation_reader.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-03-23 10:32:50 +0000
committerMatthew Hodgson <matthew@matrix.org>2018-03-23 10:32:50 +0000
commit8cbbfaefc1fc597cbbef52a10dbfb8ecd4d8a8cd (patch)
tree7c379c9bb712e64fe61b2de2d181e5780117ab54 /synapse/app/federation_reader.py
parentMerge pull request #3006 from matrix-org/erikj/state_iter (diff)
downloadsynapse-8cbbfaefc1fc597cbbef52a10dbfb8ecd4d8a8cd.tar.xz
404 correctly on missing paths via NoResource
fixes https://github.com/matrix-org/synapse/issues/2043 and https://github.com/matrix-org/synapse/issues/2029
Diffstat (limited to 'synapse/app/federation_reader.py')
-rw-r--r--synapse/app/federation_reader.py4
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,