summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-14 09:52:20 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-14 09:55:16 +0100
commit9f863d34663a4d58cf59cd15e0b0aa4a8e8581a5 (patch)
tree9a5058698cf4a43b1257596a82c622dca30cdbc1 /synapse/server.py
parentgrammar fix (diff)
downloadsynapse-9f863d34663a4d58cf59cd15e0b0aa4a8e8581a5.tar.xz
Start phasing out HttpServer: we should be using Resources instead. Added resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree.
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/server.py b/synapse/server.py
index 96830a88b1..537e431375 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -70,6 +70,9 @@ class BaseHomeServer(object):
         'room_lock_manager',
         'notifier',
         'distributor',
+        'resource_for_client',
+        'resource_for_federation',
+        'resource_for_web_client',
     ]
 
     def __init__(self, hostname, **kwargs):
@@ -178,9 +181,6 @@ class HomeServer(BaseHomeServer):
 
     def register_servlets(self):
         """ Register all servlets associated with this HomeServer.
-
-        Args:
-            host_web_client (bool): True to host the web client as well.
         """
         # Simply building the ServletFactory is sufficient to have it register
-        factory = self.get_rest_servlet_factory()
+        self.get_rest_servlet_factory()