diff options
author | Erik Johnston <erik@matrix.org> | 2019-12-11 17:01:41 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-12-11 17:01:41 +0000 |
commit | 6828b47c459ea15d2815fe880616aa260a546838 (patch) | |
tree | bdcc359e06bd7f7f977c976fe1d770bd708b0f55 /synapse/app/pusher.py | |
parent | Newsfile (diff) | |
parent | Add `include_event_in_state` to _get_state_for_room (#6521) (diff) | |
download | synapse-6828b47c459ea15d2815fe880616aa260a546838.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/initial_sync_asnyc
Diffstat (limited to 'synapse/app/pusher.py')
-rw-r--r-- | synapse/app/pusher.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index 01a5ffc363..dd52a9fc2d 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -33,6 +33,7 @@ from synapse.replication.slave.storage.account_data import SlavedAccountDataStor from synapse.replication.slave.storage.events import SlavedEventStore from synapse.replication.slave.storage.pushers import SlavedPusherStore from synapse.replication.slave.storage.receipts import SlavedReceiptsStore +from synapse.replication.slave.storage.room import RoomStore from synapse.replication.tcp.client import ReplicationClientHandler from synapse.server import HomeServer from synapse.storage import DataStore @@ -45,7 +46,11 @@ logger = logging.getLogger("synapse.app.pusher") class PusherSlaveStore( - SlavedEventStore, SlavedPusherStore, SlavedReceiptsStore, SlavedAccountDataStore + SlavedEventStore, + SlavedPusherStore, + SlavedReceiptsStore, + SlavedAccountDataStore, + RoomStore, ): update_pusher_last_stream_ordering_and_success = __func__( DataStore.update_pusher_last_stream_ordering_and_success |