diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-07-23 17:15:12 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-07-23 17:15:12 +0100 |
| commit | 4f5cc8e4e796153cbdc09517e521fc3a23eb66c2 (patch) | |
| tree | ccaa25ba8cec666b88ac217f6495cf59663550b0 /synapse/replication/http/send_event.py | |
| parent | Remove redundant checks on room forgottenness (diff) | |
| parent | Merge pull request #3582 from matrix-org/erikj/fixup_stateless (diff) | |
| download | synapse-4f5cc8e4e796153cbdc09517e521fc3a23eb66c2.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/remove_who_forgot_in_room
Diffstat (limited to 'synapse/replication/http/send_event.py')
| -rw-r--r-- | synapse/replication/http/send_event.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/replication/http/send_event.py b/synapse/replication/http/send_event.py index 2eede54792..5227bc333d 100644 --- a/synapse/replication/http/send_event.py +++ b/synapse/replication/http/send_event.py @@ -34,12 +34,13 @@ logger = logging.getLogger(__name__) @defer.inlineCallbacks -def send_event_to_master(clock, client, host, port, requester, event, context, +def send_event_to_master(clock, store, client, host, port, requester, event, context, ratelimit, extra_users): """Send event to be handled on the master Args: clock (synapse.util.Clock) + store (DataStore) client (SimpleHttpClient) host (str): host of master port (int): port on master listening for HTTP replication @@ -53,11 +54,13 @@ def send_event_to_master(clock, client, host, port, requester, event, context, host, port, event.event_id, ) + serialized_context = yield context.serialize(event, store) + payload = { "event": event.get_pdu_json(), "internal_metadata": event.internal_metadata.get_dict(), "rejected_reason": event.rejected_reason, - "context": context.serialize(event), + "context": serialized_context, "requester": requester.serialize(), "ratelimit": ratelimit, "extra_users": [u.to_string() for u in extra_users], |