summary refs log tree commit diff
diff options
context:
space:
mode:
authorQuentin Gliech <quenting@element.io>2023-04-05 13:49:15 +0200
committerGitHub <noreply@github.com>2023-04-05 07:49:15 -0400
commit6eb3edec473899f9145124d33a85b153e4a0cda9 (patch)
tree1d81a99aa509c5e8aeb155f7c3e1fa69980d23a9
parentUpdate changelog (diff)
downloadsynapse-6eb3edec473899f9145124d33a85b153e4a0cda9.tar.xz
Fix the 'set_device_id_for_pushers_txn' background update. (#15391)
Refer to the correct field from the response when updating
the background update progress.
-rw-r--r--changelog.d/15391.bugfix1
-rw-r--r--synapse/storage/databases/main/pusher.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/15391.bugfix b/changelog.d/15391.bugfix
new file mode 100644
index 0000000000..22b3bfe668
--- /dev/null
+++ b/changelog.d/15391.bugfix
@@ -0,0 +1 @@
+Fix the `set_device_id_for_pushers_txn` background update crash.
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)