summary refs log tree commit diff
path: root/synapse/app/user_dir.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2018-03-23 11:10:32 +0000
committerGitHub <noreply@github.com>2018-03-23 11:10:32 +0000
commitb7e7b52452493f0abc76b0e75bed7c6b594333ae (patch)
tree7c379c9bb712e64fe61b2de2d181e5780117ab54 /synapse/app/user_dir.py
parentMerge pull request #3006 from matrix-org/erikj/state_iter (diff)
parent404 correctly on missing paths via NoResource (diff)
downloadsynapse-b7e7b52452493f0abc76b0e75bed7c6b594333ae.tar.xz
Merge pull request #3022 from matrix-org/matthew/noresource
404 correctly on missing paths via NoResource
Diffstat (limited to 'synapse/app/user_dir.py')
-rw-r--r--synapse/app/user_dir.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py
index 494ccb702c..5f845e80d1 100644
--- a/synapse/app/user_dir.py
+++ b/synapse/app/user_dir.py
@@ -43,7 +43,7 @@ from synapse.util.logcontext import LoggingContext, preserve_fn
 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.user_dir")
 
@@ -116,7 +116,7 @@ class UserDirectoryServer(HomeServer):
                         "/_matrix/client/api/v1": resource,
                     })
 
-        root_resource = create_resource_tree(resources, Resource())
+        root_resource = create_resource_tree(resources, NoResource())
 
         _base.listen_tcp(
             bind_addresses,