Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 01:04:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge rest servlets into the client json resource object

Browse source
This commit is contained in:
Mark Haines 2015-01-23 10:37:38 +00:00
parent 22f00a09dd
commit 7256def8e4
5 changed files with 18 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/app/homeserver.py
View file

@ -37,6 +37,7 @@ from synapse.api.urls import (
from synapse.config.homeserver import HomeServerConfig
from synapse.crypto import context_factory
from synapse.util.logcontext import LoggingContext
from synapse.rest.client.v1 import ClientV1RestResource
from daemonize import Daemonize
import twisted.manhole.telnet
@ -59,7 +60,7 @@ class SynapseHomeServer(HomeServer):
return MatrixFederationHttpClient(self)
def build_resource_for_client(self):
return JsonResource()
return ClientV1RestResource(self)
def build_resource_for_federation(self):
return JsonResource()
@ -224,8 +225,6 @@ def setup():
content_addr=config.content_addr,
)
hs.register_servlets()
hs.create_resource_tree(
web_client=config.webclient,
redirect_root_to_web_client=True,