summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2016-07-19 15:53:04 +0100
committerGitHub <noreply@github.com>2016-07-19 15:53:04 +0100
commit9a7a77a22a8571a2300a520695495c97ab09b287 (patch)
tree43017890e8ab8e44d4db05ccbe9f365c8e9350ea /synapse/server.py
parentMerge pull request #930 from matrix-org/markjh/handlers (diff)
parentschema fix (diff)
downloadsynapse-9a7a77a22a8571a2300a520695495c97ab09b287.tar.xz
Merge pull request #929 from matrix-org/rav/support_deviceid_in_login
Add device_id support to /login
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py

index d49a1a8a96..e8b166990d 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -25,6 +25,7 @@ from twisted.enterprise import adbapi from synapse.appservice.scheduler import ApplicationServiceScheduler from synapse.appservice.api import ApplicationServiceApi from synapse.federation import initialize_http_replication +from synapse.handlers.device import DeviceHandler from synapse.http.client import SimpleHttpClient, InsecureInterceptableContextFactory from synapse.notifier import Notifier from synapse.api.auth import Auth @@ -92,6 +93,7 @@ class HomeServer(object): 'typing_handler', 'room_list_handler', 'auth_handler', + 'device_handler', 'application_service_api', 'application_service_scheduler', 'application_service_handler', @@ -197,6 +199,9 @@ class HomeServer(object): def build_auth_handler(self): return AuthHandler(self) + def build_device_handler(self): + return DeviceHandler(self) + def build_application_service_api(self): return ApplicationServiceApi(self)