Merge pull request #6507 from matrix-org/babolivier/pusher-room-store

Make the PusherSlaveStore inherit from the slave RoomStore
matrix-org · Dec 10, 2019 · 332f3b3 · 332f3b3
2 parents d95736a + ec5fdd1
commit 332f3b3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/changelog.d/6507.bugfix 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
@@ -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
@@ -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
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.