diff options
| author | David Baker <dave@matrix.org> | 2016-09-09 19:11:34 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-09-09 19:11:34 +0100 |
| commit | b91e2833b3b59d6a8d104d8f6304383e68de2086 (patch) | |
| tree | 4df820b06f89d7cb98ec6f75a99be4eebbd92ef6 /synapse/server.py | |
| parent | Add index to event_push_actions (diff) | |
| parent | Merge pull request #1096 from matrix-org/markjh/get_access_token (diff) | |
| download | synapse-b91e2833b3b59d6a8d104d8f6304383e68de2086.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/make_notif_highlight_query_fast
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py index af3246504b..f516f08167 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -35,6 +35,7 @@ from synapse.federation import initialize_http_replication from synapse.handlers import Handlers from synapse.handlers.appservice import ApplicationServicesHandler from synapse.handlers.auth import AuthHandler +from synapse.handlers.devicemessage import DeviceMessageHandler from synapse.handlers.device import DeviceHandler from synapse.handlers.e2e_keys import E2eKeysHandler from synapse.handlers.presence import PresenceHandler @@ -100,6 +101,7 @@ class HomeServer(object): 'application_service_api', 'application_service_scheduler', 'application_service_handler', + 'device_message_handler', 'notifier', 'distributor', 'client_resource', @@ -205,6 +207,9 @@ class HomeServer(object): def build_device_handler(self): return DeviceHandler(self) + def build_device_message_handler(self): + return DeviceMessageHandler(self) + def build_e2e_keys_handler(self): return E2eKeysHandler(self) |