summary refs log tree commit diff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-13 15:57:58 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-13 15:57:58 +0100
commit2da1e1526ecff27a24de3701a8f472f53c7415e8 (patch)
treed5f2bec74797a900babbb901ef91b7c37ff18cf2
parentMerge branch 'master' of github.com:matrix-org/synapse (diff)
downloadsynapse-2da1e1526ecff27a24de3701a8f472f53c7415e8.tar.xz
Don't pass host_web_client flag to register_servlets, it needs to be a Resource not a RestServlet.
Diffstat (limited to '')
-rw-r--r--synapse/app/homeserver.py2
-rw-r--r--synapse/server.py4
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)