diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-09-08 14:26:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-08 14:26:47 +0100 |
| commit | 2117c409a01231de146eb38330e3941ea2564e4a (patch) | |
| tree | 806152a98d66013b94882c85cb1cb6129be62e78 /synapse/server.py | |
| parent | Log delta files we're applying (diff) | |
| parent | Merge branch 'develop' into markjh/direct_to_device_federation (diff) | |
| download | synapse-2117c409a01231de146eb38330e3941ea2564e4a.tar.xz | |
Merge pull request #1074 from matrix-org/markjh/direct_to_device_federation
Send device messages over federation
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) |