diff options
| author | Erik Johnston <erik@matrix.org> | 2018-07-23 13:21:15 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-07-23 13:21:15 +0100 |
| commit | 0b0b24cb82d3337bef5d3dd4b960990934d8d5c5 (patch) | |
| tree | 3cbf0143b30ef340a91a99f5d491ee2eb7aa5e8c /synapse/server.py | |
| parent | Update docs/workers.rst (diff) | |
| parent | Merge pull request #3520 from matrix-org/matthew/sync_deleted_devices (diff) | |
| download | synapse-0b0b24cb82d3337bef5d3dd4b960990934d8d5c5.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_apis_move
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 83eacccc29..140be9ebe8 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -75,6 +75,7 @@ from synapse.rest.media.v1.media_repository import ( MediaRepository, MediaRepositoryResource, ) +from synapse.secrets import Secrets from synapse.server_notices.server_notices_manager import ServerNoticesManager from synapse.server_notices.server_notices_sender import ServerNoticesSender from synapse.server_notices.worker_server_notices_sender import WorkerServerNoticesSender @@ -159,6 +160,7 @@ class HomeServer(object): 'groups_server_handler', 'groups_attestation_signing', 'groups_attestation_renewer', + 'secrets', 'spam_checker', 'room_member_handler', 'federation_registry', @@ -409,6 +411,9 @@ class HomeServer(object): def build_groups_attestation_renewer(self): return GroupAttestionRenewer(self) + def build_secrets(self): + return Secrets() + def build_spam_checker(self): return SpamChecker(self) |