diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-10 12:57:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 12:57:37 +0000 |
| commit | 332f3b36e53768f8dcfec88f47b248b8c672dc46 (patch) | |
| tree | 0291f6cf33cbc837ffde05088042b1ceb2d887a4 | |
| parent | Fix erroneous reference for new room directory defaults. (diff) | |
| parent | Changelog (diff) | |
| download | synapse-332f3b36e53768f8dcfec88f47b248b8c672dc46.tar.xz | |
Merge pull request #6507 from matrix-org/babolivier/pusher-room-store
Make the PusherSlaveStore inherit from the slave RoomStore
| -rw-r--r-- | changelog.d/6507.bugfix | 1 | ||||
| -rw-r--r-- | synapse/app/pusher.py | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changelog.d/6507.bugfix b/changelog.d/6507.bugfix new file mode 100644 index 0000000000..7f95da52c9 --- /dev/null +++ b/changelog.d/6507.bugfix @@ -0,0 +1 @@ +Fix pusher worker failing because it can't retrieve retention policies for rooms. 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 |