diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-11-26 13:58:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-26 13:58:39 +0000 |
| commit | a8175d0f96d1fcb1f321045d620d5170c680e73a (patch) | |
| tree | 58155cf8d3c50773f6cfccfcb2d142f640fdd65f /synapse/replication/tcp/streams | |
| parent | Merge pull request #6332 from matrix-org/erikj/query_devices_fix (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/fix_account... (diff) | |
| download | synapse-a8175d0f96d1fcb1f321045d620d5170c680e73a.tar.xz | |
Prevent account_data content from being sent over TCP replication (#6333)
Diffstat (limited to 'synapse/replication/tcp/streams')
| -rw-r--r-- | synapse/replication/tcp/streams/_base.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/replication/tcp/streams/_base.py b/synapse/replication/tcp/streams/_base.py index 9e45429d49..8512923eae 100644 --- a/synapse/replication/tcp/streams/_base.py +++ b/synapse/replication/tcp/streams/_base.py @@ -88,8 +88,7 @@ TagAccountDataStreamRow = namedtuple( "TagAccountDataStreamRow", ("user_id", "room_id", "data") # str # str # dict ) AccountDataStreamRow = namedtuple( - "AccountDataStream", - ("user_id", "room_id", "data_type", "data"), # str # str # str # dict + "AccountDataStream", ("user_id", "room_id", "data_type") # str # str # str ) GroupsStreamRow = namedtuple( "GroupsStreamRow", @@ -421,8 +420,8 @@ class AccountDataStream(Stream): results = list(room_results) results.extend( - (stream_id, user_id, None, account_data_type, content) - for stream_id, user_id, account_data_type, content in global_results + (stream_id, user_id, None, account_data_type) + for stream_id, user_id, account_data_type in global_results ) return results |