diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-17 11:27:38 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-17 11:27:38 +0100 |
| commit | 1c4561f2615e0388f20d8474646340bab657a7a2 (patch) | |
| tree | e60fe816c183e4de509f2bb2e5777bef384d886a /synapse/app/synchrotron.py | |
| parent | Merge branch 'develop' into markjh/synchrotron (diff) | |
| download | synapse-1c4561f2615e0388f20d8474646340bab657a7a2.tar.xz | |
Fix client resource prefixes
Diffstat (limited to 'synapse/app/synchrotron.py')
| -rw-r--r-- | synapse/app/synchrotron.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index f4dfe78b34..97f6001045 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -16,7 +16,6 @@ import synapse -from synapse.api.urls import CLIENT_PREFIX from synapse.config._base import ConfigError from synapse.config.database import DatabaseConfig from synapse.config.logger import LoggingConfig @@ -129,7 +128,11 @@ class SynchrotronServer(HomeServer): elif name == "client": resource = JsonResource(self, canonical_json=False) sync.register_servlets(self, resource) - resources[CLIENT_PREFIX] = resource + resources.update({ + "/_matrix/client/r0": resource, + "/_matrix/client/unstable": resource, + "/_matrix/client/v2_alpha": resource, + }) root_resource = create_resource_tree(resources, Resource()) reactor.listenTCP( @@ -184,6 +187,7 @@ def setup(config_options): config=config, version_string=get_version_string("Synapse", synapse), database_engine=database_engine, + presence_handler=object(), ) ss.setup() @@ -196,7 +200,7 @@ def setup(config_options): reactor.callWhenRunning(start) - return ps + return ss if __name__ == '__main__': |