diff options
| author | Erik Johnston <erik@matrix.org> | 2020-07-31 15:07:01 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-07-31 15:07:01 +0100 |
| commit | faba873d4b91cf03c5c2d9546a6df781ce58f2cc (patch) | |
| tree | 9fca4c5ed30c77c43023d9b365a37ec90261f2b4 /synapse/replication/http/federation.py | |
| parent | Newsfile (diff) | |
| parent | Add docs for undoing room shutdowns (#7998) (diff) | |
| download | synapse-faba873d4b91cf03c5c2d9546a6df781ce58f2cc.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/add_rate_limiting_to_joins
Diffstat (limited to 'synapse/replication/http/federation.py')
| -rw-r--r-- | synapse/replication/http/federation.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/replication/http/federation.py b/synapse/replication/http/federation.py index c287c4e269..ca065e819e 100644 --- a/synapse/replication/http/federation.py +++ b/synapse/replication/http/federation.py @@ -78,7 +78,9 @@ class ReplicationFederationSendEventsRestServlet(ReplicationEndpoint): """ event_payloads = [] for event, context in event_and_contexts: - serialized_context = yield context.serialize(event, store) + serialized_context = yield defer.ensureDeferred( + context.serialize(event, store) + ) event_payloads.append( { |