diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-04-09 13:48:15 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-04-09 13:48:15 +0100 |
| commit | 89dda613153c4869f3c9ce96f5cbc47f93f54723 (patch) | |
| tree | 320e718965e5e843fe3950bd8c19cf4b9ad367a6 /synapse/app/pusher.py | |
| parent | 0.27.3 (diff) | |
| parent | Merge pull request #3029 from matrix-org/erikj/linearize_generate_user_id (diff) | |
| download | synapse-89dda613153c4869f3c9ce96f5cbc47f93f54723.tar.xz | |
Merge branch 'develop' into release-v0.27.0
Diffstat (limited to 'synapse/app/pusher.py')
| -rw-r--r-- | synapse/app/pusher.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index 98a4a7c62c..d5c3a85195 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -37,7 +37,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 defer, reactor -from twisted.web.resource import Resource +from twisted.web.resource import NoResource logger = logging.getLogger("synapse.app.pusher") @@ -94,7 +94,7 @@ class PusherServer(HomeServer): if name == "metrics": resources[METRICS_PREFIX] = MetricsResource(self) - root_resource = create_resource_tree(resources, Resource()) + root_resource = create_resource_tree(resources, NoResource()) _base.listen_tcp( bind_addresses, |