diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-06-29 20:25:47 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-06-29 20:25:47 +0100 |
| commit | 785bceef726789e6969c98be89b073f2e1c10a92 (patch) | |
| tree | 8536a593648ad86c6e6a3cdc32db7bfdbc456966 /synapse/app/generic_worker.py | |
| parent | Do not recurse into non-spaces in the spaces summary. (#10256) (diff) | |
| parent | Update newsfiles (diff) | |
| download | synapse-785bceef726789e6969c98be89b073f2e1c10a92.tar.xz | |
Merge branch 'release-v1.37' into develop
Diffstat (limited to 'synapse/app/generic_worker.py')
| -rw-r--r-- | synapse/app/generic_worker.py | 2 |
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 |