diff options
author | Erik Johnston <erikj@jki.re> | 2017-02-02 11:24:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-02 11:24:11 +0000 |
commit | 5ae38b65c1720176dfdae6f654be06c6f88e2084 (patch) | |
tree | 2c303e7eda397feec27f93fe6a5e678c03e0b0e5 /synapse/server.py | |
parent | Merge pull request #1872 from matrix-org/erikj/key_changes (diff) | |
parent | Fix email push in pusher worker (diff) | |
download | synapse-5ae38b65c1720176dfdae6f654be06c6f88e2084.tar.xz |
Merge pull request #1875 from matrix-org/erikj/fix_email_push
Fix email push in pusher worker
Diffstat (limited to 'synapse/server.py')
-rw-r--r-- | synapse/server.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/server.py b/synapse/server.py index 0bfb411269..c577032041 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -37,7 +37,7 @@ from synapse.federation.transport.client import TransportLayerClient from synapse.federation.transaction_queue import TransactionQueue from synapse.handlers import Handlers from synapse.handlers.appservice import ApplicationServicesHandler -from synapse.handlers.auth import AuthHandler +from synapse.handlers.auth import AuthHandler, MacaroonGeneartor from synapse.handlers.devicemessage import DeviceMessageHandler from synapse.handlers.device import DeviceHandler from synapse.handlers.e2e_keys import E2eKeysHandler @@ -131,6 +131,7 @@ class HomeServer(object): 'federation_transport_client', 'federation_sender', 'receipts_handler', + 'macaroon_generator', ] def __init__(self, hostname, **kwargs): @@ -213,6 +214,9 @@ class HomeServer(object): def build_auth_handler(self): return AuthHandler(self) + def build_macaroon_generator(self): + return MacaroonGeneartor(self) + def build_device_handler(self): return DeviceHandler(self) |