From 2da1e1526ecff27a24de3701a8f472f53c7415e8 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 13 Aug 2014 15:57:58 +0100 Subject: [PATCH] Don't pass host_web_client flag to register_servlets, it needs to be a Resource not a RestServlet. --- synapse/app/homeserver.py | 2 +- synapse/server.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index f89b4652e3..82afb04c7d 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -148,7 +148,7 @@ def setup(): # the replication layer hs.get_federation() - hs.register_servlets(host_web_client=args.webclient) + hs.register_servlets() hs.get_http_server().start_listening(args.port) diff --git a/synapse/server.py b/synapse/server.py index ba9022f323..0211972d05 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -171,7 +171,7 @@ class HomeServer(BaseHomeServer): def build_distributor(self): return Distributor() - def register_servlets(self, host_web_client): + def register_servlets(self): """ Register all servlets associated with this HomeServer. Args: @@ -179,5 +179,3 @@ class HomeServer(BaseHomeServer): """ # Simply building the ServletFactory is sufficient to have it register factory = self.get_rest_servlet_factory() - if host_web_client: - factory.register_web_client(self)