diff options
| author | Erik Johnston <erikj@jki.re> | 2019-05-15 10:36:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-15 10:36:30 +0100 |
| commit | 0aba6c82513802822482de6e1e797b07502b92b5 (patch) | |
| tree | 5da1073792ad81b5d192dce649b8518cd1907b6b /synapse/server.py | |
| parent | Merge pull request #5184 from matrix-org/erikj/expose_get_events_as_array (diff) | |
| parent | Update docstring with correct return type (diff) | |
| download | synapse-0aba6c82513802822482de6e1e797b07502b92b5.tar.xz | |
Merge pull request #5183 from matrix-org/erikj/async_serialize_event
Allow client event serialization to be async
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 8c30ac2fa5..80d40b9272 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -35,6 +35,7 @@ from synapse.crypto import context_factory from synapse.crypto.keyring import Keyring from synapse.events.builder import EventBuilderFactory from synapse.events.spamcheck import SpamChecker +from synapse.events.utils import EventClientSerializer from synapse.federation.federation_client import FederationClient from synapse.federation.federation_server import ( FederationHandlerRegistry, @@ -185,6 +186,7 @@ class HomeServer(object): 'sendmail', 'registration_handler', 'account_validity_handler', + 'event_client_serializer', ] REQUIRED_ON_MASTER_STARTUP = [ @@ -511,6 +513,9 @@ class HomeServer(object): def build_account_validity_handler(self): return AccountValidityHandler(self) + def build_event_client_serializer(self): + return EventClientSerializer(self) + def remove_pusher(self, app_id, push_key, user_id): return self.get_pusherpool().remove_pusher(app_id, push_key, user_id) |