summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2023-04-06 11:44:26 -0400
committerPatrick Cloke <patrickc@matrix.org>2023-04-06 11:44:26 -0400
commit72b43bec8bcbb6edb894636b5657b974e6a94a09 (patch)
tree61b4330da785626aa051ef16deae14beb71f7e66 /synapse/storage
parentImplement MSC3989 to redact the origin field. (#15393) (diff)
parent1.81.0rc2 (diff)
downloadsynapse-72b43bec8bcbb6edb894636b5657b974e6a94a09.tar.xz
Merge remote-tracking branch 'origin/release-v1.81' into develop
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/databases/main/pusher.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/pusher.py b/synapse/storage/databases/main/pusher.py

index aeb6034f46..87e28e22d3 100644 --- a/synapse/storage/databases/main/pusher.py +++ b/synapse/storage/databases/main/pusher.py
@@ -562,7 +562,7 @@ class PusherBackgroundUpdatesStore(SQLBaseStore): ) self.db_pool.updates._background_update_progress_txn( - txn, "set_device_id_for_pushers", {"pusher_id": rows[-1]["id"]} + txn, "set_device_id_for_pushers", {"pusher_id": rows[-1]["pusher_id"]} ) return len(rows)