summary refs log tree commit diff
path: root/synapse/replication
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-23 14:09:47 +0000
committerErik Johnston <erik@matrix.org>2016-11-23 14:09:47 +0000
commit26072df6af7ca37b8e6e5f340a00e695de5c93d5 (patch)
tree2abd7451b4b1ffbef5f8e899f1fed7272e89c193 /synapse/replication
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_... (diff)
downloadsynapse-26072df6af7ca37b8e6e5f340a00e695de5c93d5.tar.xz
Ensure only main or federation_sender process can send federation traffic
Diffstat (limited to 'synapse/replication')
-rw-r--r--synapse/replication/resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py

index cb9697e378..d79b421cba 100644 --- a/synapse/replication/resource.py +++ b/synapse/replication/resource.py
@@ -460,7 +460,7 @@ class ReplicationResource(Resource): ) upto_token = _position_from_rows(to_device_rows, current_position) writer.write_header_and_rows("to_device", to_device_rows, ( - "position", "entity", + "position", "user_id", "device_id", "message_json" ), position=upto_token) @defer.inlineCallbacks