summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-04-06 16:52:39 +0100
committerMark Haines <mjark@negativecurvature.net>2016-04-06 16:52:39 +0100
commit8d2bca1a90bc737c1a51d1a78d0e6c5d77589cea (patch)
treeb5f0d0df4d80e5f826a3577f0bb8cda3b3df5bd8 /synapse
parentMerge pull request #697 from matrix-org/markjh/slaveI (diff)
parentTest that room membership is replicated (diff)
downloadsynapse-8d2bca1a90bc737c1a51d1a78d0e6c5d77589cea.tar.xz
Merge pull request #702 from matrix-org/markjh/slaveII
Test that room membership is replicated
Diffstat (limited to 'synapse')
-rw-r--r--synapse/replication/slave/storage/events.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py

index 68b924e37b..680dc89536 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py
@@ -71,9 +71,6 @@ class SlavedEventStore(BaseSlavedStore): get_current_state = DataStore.get_current_state.__func__ get_current_state_for_key = DataStore.get_current_state_for_key.__func__ - _get_rooms_for_user_where_membership_is_txn = ( - DataStore._get_rooms_for_user_where_membership_is_txn.__func__ - ) get_rooms_for_user_where_membership_is = ( DataStore.get_rooms_for_user_where_membership_is.__func__ ) @@ -95,6 +92,10 @@ class SlavedEventStore(BaseSlavedStore): _fetch_events_txn = DataStore._fetch_events_txn.__func__ _fetch_event_rows = DataStore._fetch_event_rows.__func__ _get_event_from_row_txn = DataStore._get_event_from_row_txn.__func__ + _get_rooms_for_user_where_membership_is_txn = ( + DataStore._get_rooms_for_user_where_membership_is_txn.__func__ + ) + _get_members_rows_txn = DataStore._get_members_rows_txn.__func__ def stream_positions(self): result = super(SlavedEventStore, self).stream_positions()