diff options
| author | Erik Johnston <erik@matrix.org> | 2018-10-19 15:48:59 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-10-19 15:48:59 +0100 |
| commit | 056f0991262902e22f0414e17c01198e1606384a (patch) | |
| tree | fa365dc1aef28f86499122d8b9176c03dd95e863 /synapse/replication/slave/storage/deviceinbox.py | |
| parent | Batch process handling state groups (diff) | |
| parent | Fix manhole on py3 (pt 2) (#4067) (diff) | |
| download | synapse-056f0991262902e22f0414e17c01198e1606384a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_state_groups
Diffstat (limited to 'synapse/replication/slave/storage/deviceinbox.py')
| -rw-r--r-- | synapse/replication/slave/storage/deviceinbox.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/replication/slave/storage/deviceinbox.py b/synapse/replication/slave/storage/deviceinbox.py index 87eaa53004..4f19fd35aa 100644 --- a/synapse/replication/slave/storage/deviceinbox.py +++ b/synapse/replication/slave/storage/deviceinbox.py @@ -17,7 +17,7 @@ from synapse.storage import DataStore from synapse.util.caches.expiringcache import ExpiringCache from synapse.util.caches.stream_change_cache import StreamChangeCache -from ._base import BaseSlavedStore +from ._base import BaseSlavedStore, __func__ from ._slaved_id_tracker import SlavedIdTracker @@ -43,11 +43,11 @@ class SlavedDeviceInboxStore(BaseSlavedStore): expiry_ms=30 * 60 * 1000, ) - get_to_device_stream_token = DataStore.get_to_device_stream_token.__func__ - get_new_messages_for_device = DataStore.get_new_messages_for_device.__func__ - get_new_device_msgs_for_remote = DataStore.get_new_device_msgs_for_remote.__func__ - delete_messages_for_device = DataStore.delete_messages_for_device.__func__ - delete_device_msgs_for_remote = DataStore.delete_device_msgs_for_remote.__func__ + get_to_device_stream_token = __func__(DataStore.get_to_device_stream_token) + get_new_messages_for_device = __func__(DataStore.get_new_messages_for_device) + get_new_device_msgs_for_remote = __func__(DataStore.get_new_device_msgs_for_remote) + delete_messages_for_device = __func__(DataStore.delete_messages_for_device) + delete_device_msgs_for_remote = __func__(DataStore.delete_device_msgs_for_remote) def stream_positions(self): result = super(SlavedDeviceInboxStore, self).stream_positions() |