Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Make the PusherSlaveStore inherit from the slave RoomStore #6507

Merged
merged 2 commits into from
Dec 10, 2019
Merged

Make the PusherSlaveStore inherit from the slave RoomStore #6507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ac7843
Make the PusherSlaveStore inherit from the slave RoomStore
babolivier Dec 10, 2019
ec5fdd1
Changelog
babolivier Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/6507.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix pusher worker failing because it can't retrieve retention policies for rooms.
7 changes: 6 additions & 1 deletion synapse/app/pusher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
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
Expand All @@ -45,7 +46,11 @@


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
Expand Down