summary refs log tree commit diff
path: root/synapse/app/generic_worker.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-06-29 20:54:40 +0100
committerRichard van der Hoff <richard@matrix.org>2021-06-29 20:54:40 +0100
commitd70eefc313c84a130ff726a6010b0865cfdba9d8 (patch)
tree3092a2d57eb36ab1fbb2f0d21b5a78e2bb4b5eb1 /synapse/app/generic_worker.py
parentRevert "Don't send catchup transactions for matrix hq" (diff)
parentUpdate newsfiles (diff)
downloadsynapse-d70eefc313c84a130ff726a6010b0865cfdba9d8.tar.xz
Merge branch 'release-v1.37' into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/generic_worker.py')
-rw-r--r--synapse/app/generic_worker.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py

index af8a1833f3..5b041fcaad 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py
@@ -108,6 +108,7 @@ from synapse.server import HomeServer from synapse.storage.databases.main.censor_events import CensorEventsStore from synapse.storage.databases.main.client_ips import ClientIpWorkerStore from synapse.storage.databases.main.e2e_room_keys import EndToEndRoomKeyStore +from synapse.storage.databases.main.lock import LockStore from synapse.storage.databases.main.media_repository import MediaRepositoryStore from synapse.storage.databases.main.metrics import ServerMetricsStore from synapse.storage.databases.main.monthly_active_users import ( @@ -249,6 +250,7 @@ class GenericWorkerSlavedStore( ServerMetricsStore, SearchStore, TransactionWorkerStore, + LockStore, BaseSlavedStore, ): pass