summary refs log tree commit diff
path: root/synapse/replication
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-05-23 11:18:13 +0100
committerGitHub <noreply@github.com>2017-05-23 11:18:13 +0100
commitfbbc40f38572a744668e9438b61ab0ef86cf4c62 (patch)
tree0a89db32d7ffec1d0c9daf8598e3e09ffe4d9b07 /synapse/replication
parentMerge pull request #2242 from matrix-org/erikj/email_refactor (diff)
parentRemove redundant invalidation (diff)
downloadsynapse-fbbc40f38572a744668e9438b61ab0ef86cf4c62.tar.xz
Merge pull request #2237 from matrix-org/erikj/sync_key_count
Add count of one time keys to sync stream
Diffstat (limited to 'synapse/replication')
-rw-r--r--synapse/replication/slave/storage/devices.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/replication/slave/storage/devices.py b/synapse/replication/slave/storage/devices.py
index 4d4a435471..7687867aee 100644
--- a/synapse/replication/slave/storage/devices.py
+++ b/synapse/replication/slave/storage/devices.py
@@ -16,6 +16,7 @@
 from ._base import BaseSlavedStore
 from ._slaved_id_tracker import SlavedIdTracker
 from synapse.storage import DataStore
+from synapse.storage.end_to_end_keys import EndToEndKeyStore
 from synapse.util.caches.stream_change_cache import StreamChangeCache
 
 
@@ -45,6 +46,7 @@ class SlavedDeviceStore(BaseSlavedStore):
     _mark_as_sent_devices_by_remote_txn = (
         DataStore._mark_as_sent_devices_by_remote_txn.__func__
     )
+    count_e2e_one_time_keys = EndToEndKeyStore.__dict__["count_e2e_one_time_keys"]
 
     def stream_positions(self):
         result = super(SlavedDeviceStore, self).stream_positions()