diff options
| author | Erik Johnston <erik@matrix.org> | 2018-02-15 13:53:18 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-02-15 13:53:18 +0000 |
| commit | 106906a65e647d94a9d2faf1b3a626bc1f608a25 (patch) | |
| tree | 4a96b7e56243b2f695a84a44e27a7f146c119468 /synapse/replication/http | |
| parent | Merge pull request #2872 from matrix-org/erikj/event_worker_dont_log (diff) | |
| download | synapse-106906a65e647d94a9d2faf1b3a626bc1f608a25.tar.xz | |
Don't serialize current state over replication
Diffstat (limited to 'synapse/replication/http')
| -rw-r--r-- | synapse/replication/http/send_event.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/replication/http/send_event.py b/synapse/replication/http/send_event.py index 7b21a2213c..468f4b68f4 100644 --- a/synapse/replication/http/send_event.py +++ b/synapse/replication/http/send_event.py @@ -46,7 +46,7 @@ def send_event_to_master(client, host, port, requester, event, context): "event": event.get_pdu_json(), "internal_metadata": event.internal_metadata.get_dict(), "rejected_reason": event.rejected_reason, - "context": context.serialize(), + "context": context.serialize(event), "requester": requester.serialize(), } @@ -96,7 +96,7 @@ class ReplicationSendEventRestServlet(RestServlet): event = FrozenEvent(event_dict, internal_metadata, rejected_reason) requester = Requester.deserialize(self.store, content["requester"]) - context = EventContext.deserialize(self.store, content["context"]) + context = yield EventContext.deserialize(self.store, content["context"]) if requester.user: request.authenticated_entity = requester.user.to_string() |