summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2023-02-14 12:20:25 +0100
committerGitHub <noreply@github.com>2023-02-14 11:20:25 +0000
commitcb262713b701d1abcbca03334d17e2d0f81eee4a (patch)
tree29e40cab2ab26cb179b1c41d5fd4b5a2717fb2ae /synapse/storage
parentSkip calculating unread push actions in `/sync` when `enable_push` is false. ... (diff)
downloadsynapse-cb262713b701d1abcbca03334d17e2d0f81eee4a.tar.xz
Fix clashing DB txn name (#15070)
* Fix clashing DB txn name

* Newsfile
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/databases/main/end_to_end_keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/end_to_end_keys.py b/synapse/storage/databases/main/end_to_end_keys.py

index 752dc16e17..2c2d145666 100644 --- a/synapse/storage/databases/main/end_to_end_keys.py +++ b/synapse/storage/databases/main/end_to_end_keys.py
@@ -262,7 +262,7 @@ class EndToEndKeyWorkerStore(EndToEndKeyBackgroundStore, CacheInvalidationWorker for batch in batch_iter(signature_query, 50): cross_sigs_result = await self.db_pool.runInteraction( - "get_e2e_cross_signing_signatures", + "get_e2e_cross_signing_signatures_for_devices", self._get_e2e_cross_signing_signatures_for_devices_txn, batch, )