tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Don't pass host_web_client flag to register_servlets, it needs to be a Resource not a RestServlet.

Browse source
This commit is contained in:
Kegan Dougal 2014-08-13 15:57:58 +01:00
parent 38c7e92331
commit 2da1e1526e
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/app/homeserver.py
View file

@ -148,7 +148,7 @@ def setup():
# the replication layer # the replication layer
hs.get_federation() hs.get_federation()
hs.register_servlets(host_web_client=args.webclient) hs.register_servlets()
hs.get_http_server().start_listening(args.port) hs.get_http_server().start_listening(args.port)

4
synapse/server.py
View file

@ -171,7 +171,7 @@ class HomeServer(BaseHomeServer):
def build_distributor(self): def build_distributor(self):
return Distributor() return Distributor()
def register_servlets(self, host_web_client): def register_servlets(self):
""" Register all servlets associated with this HomeServer. """ Register all servlets associated with this HomeServer.
Args: Args:
@ -179,5 +179,3 @@ class HomeServer(BaseHomeServer):
""" """
# Simply building the ServletFactory is sufficient to have it register # Simply building the ServletFactory is sufficient to have it register
factory = self.get_rest_servlet_factory() factory = self.get_rest_servlet_factory()
if host_web_client:
factory.register_web_client(self)