diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-10 13:43:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 13:43:07 +0000 |
| commit | a964f18887b0138b256933b692559c9612d02504 (patch) | |
| tree | fe30dfc65619fc4bc7bb6f7c1d64af35fde48859 | |
| parent | Merge pull request #6507 from matrix-org/babolivier/pusher-room-store (diff) | |
| parent | Changelog (diff) | |
| download | synapse-a964f18887b0138b256933b692559c9612d02504.tar.xz | |
Merge pull request #6509 from matrix-org/babolivier/fix-room-store-config
Give the server config to the RoomWorkerStore
| -rw-r--r-- | changelog.d/6509.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/data_stores/main/room.py | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changelog.d/6509.bugfix b/changelog.d/6509.bugfix new file mode 100644 index 0000000000..7f95da52c9 --- /dev/null +++ b/changelog.d/6509.bugfix @@ -0,0 +1 @@ +Fix pusher worker failing because it can't retrieve retention policies for rooms. diff --git a/synapse/storage/data_stores/main/room.py b/synapse/storage/data_stores/main/room.py index 0148be20d3..aa476d0fbf 100644 --- a/synapse/storage/data_stores/main/room.py +++ b/synapse/storage/data_stores/main/room.py @@ -46,6 +46,11 @@ RatelimitOverride = collections.namedtuple( class RoomWorkerStore(SQLBaseStore): + def __init__(self, database: Database, db_conn, hs): + super(RoomWorkerStore, self).__init__(database, db_conn, hs) + + self.config = hs.config + def get_room(self, room_id): """Retrieve a room. |