diff options
| author | Erik Johnston <erik@matrix.org> | 2018-02-21 10:54:18 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-02-21 10:54:21 +0000 |
| commit | 6f727653717d9fc32f5676f4d991fbbe85c1c812 (patch) | |
| tree | 5a0515c29f056d1061423fb800b264989394898f /synapse/replication/slave | |
| parent | Merge pull request #2896 from matrix-org/erikj/split_receipts_store (diff) | |
| download | synapse-6f727653717d9fc32f5676f4d991fbbe85c1c812.tar.xz | |
Split PusherStore
Diffstat (limited to 'synapse/replication/slave')
| -rw-r--r-- | synapse/replication/slave/storage/pushers.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/synapse/replication/slave/storage/pushers.py b/synapse/replication/slave/storage/pushers.py index 4e8d68ece9..e352c3235d 100644 --- a/synapse/replication/slave/storage/pushers.py +++ b/synapse/replication/slave/storage/pushers.py @@ -16,10 +16,10 @@ from ._base import BaseSlavedStore from ._slaved_id_tracker import SlavedIdTracker -from synapse.storage import DataStore +from synapse.storage.pusher import PusherWorkerStore -class SlavedPusherStore(BaseSlavedStore): +class SlavedPusherStore(PusherWorkerStore, BaseSlavedStore): def __init__(self, db_conn, hs): super(SlavedPusherStore, self).__init__(db_conn, hs) @@ -28,13 +28,6 @@ class SlavedPusherStore(BaseSlavedStore): extra_tables=[("deleted_pushers", "stream_id")], ) - get_all_pushers = DataStore.get_all_pushers.__func__ - get_pushers_by = DataStore.get_pushers_by.__func__ - get_pushers_by_app_id_and_pushkey = ( - DataStore.get_pushers_by_app_id_and_pushkey.__func__ - ) - _decode_pushers_rows = DataStore._decode_pushers_rows.__func__ - def stream_positions(self): result = super(SlavedPusherStore, self).stream_positions() result["pushers"] = self._pushers_id_gen.get_current_token() |