diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-08-03 11:12:47 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-08-03 11:12:47 +0100 |
commit | 921f17f93810ac07fd5d15494882db78fdcf3e3c (patch) | |
tree | bd4f29ec888a4e445654688e0f6da994be899a63 /synapse/replication/slave/storage/events.py | |
parent | E2E keys: Make federation query share code with client query (diff) | |
parent | Factor out some of the code shared between the sytest scripts (#974) (diff) | |
download | synapse-921f17f93810ac07fd5d15494882db78fdcf3e3c.tar.xz |
Merge branch 'develop' into rav/refactor_device_query
Diffstat (limited to 'synapse/replication/slave/storage/events.py')
-rw-r--r-- | synapse/replication/slave/storage/events.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py index 6a644f1386..f4f31f2d27 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py @@ -145,6 +145,15 @@ class SlavedEventStore(BaseSlavedStore): _get_events_around_txn = DataStore._get_events_around_txn.__func__ _get_some_state_from_cache = DataStore._get_some_state_from_cache.__func__ + get_backfill_events = DataStore.get_backfill_events.__func__ + _get_backfill_events = DataStore._get_backfill_events.__func__ + get_missing_events = DataStore.get_missing_events.__func__ + _get_missing_events = DataStore._get_missing_events.__func__ + + get_auth_chain = DataStore.get_auth_chain.__func__ + get_auth_chain_ids = DataStore.get_auth_chain_ids.__func__ + _get_auth_chain_ids_txn = DataStore._get_auth_chain_ids_txn.__func__ + def stream_positions(self): result = super(SlavedEventStore, self).stream_positions() result["events"] = self._stream_id_gen.get_current_token() |