diff options
| author | Erik Johnston <erik@matrix.org> | 2018-02-23 11:26:31 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-02-23 11:26:31 +0000 |
| commit | a90c60912f3bd03c71086c061030736f9a9126b8 (patch) | |
| tree | 1a9c2452b19ff8e2b648c646365d72e29da8eea8 /synapse/replication/slave/storage/pushers.py | |
| parent | Update copyright (diff) | |
| parent | Merge pull request #2902 from matrix-org/erikj/split_events_store (diff) | |
| download | synapse-a90c60912f3bd03c71086c061030736f9a9126b8.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_event_push_actions
Diffstat (limited to 'synapse/replication/slave/storage/pushers.py')
| -rw-r--r-- | synapse/replication/slave/storage/pushers.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/synapse/replication/slave/storage/pushers.py b/synapse/replication/slave/storage/pushers.py index 4e8d68ece9..a7cd5a7291 100644 --- a/synapse/replication/slave/storage/pushers.py +++ b/synapse/replication/slave/storage/pushers.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # Copyright 2016 OpenMarket Ltd +# Copyright 2018 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,10 +17,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 +29,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() |