diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-01-23 10:55:18 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-01-23 10:55:18 +0000 |
| commit | 7dfd99f16354801ed51a3a5a99b3ea6db1e670d4 (patch) | |
| tree | c43a9fe9ca6d8713e376f56e5689bf71aa53f03d /synapse/app/homeserver.py | |
| parent | Rename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it is... (diff) | |
| parent | Merge rest servlets into the client json resource object (diff) | |
| download | synapse-7dfd99f16354801ed51a3a5a99b3ea6db1e670d4.tar.xz | |
Merge pull request #31 from matrix-org/client_api_resource
Merge rest servlets into the client json resource object
Diffstat (limited to 'synapse/app/homeserver.py')
| -rwxr-xr-x | synapse/app/homeserver.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index cd24bbdc79..fabe8ddacb 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -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, |