Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Don't error if deleting a non-existant pusher. #9121

Merged
merged 4 commits into from
Jan 25, 2021
Merged

Don't error if deleting a non-existant pusher. #9121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3e9d83
Maybe delete a pusher.
clokep Jan 14, 2021
a6bade8
Update changelog.
clokep Jan 25, 2021
2d1e2d2
Merge remote-tracking branch 'origin/develop' into clokep/del-pushers
clokep Jan 25, 2021
876648a
Merge remote-tracking branch 'origin/develop' into clokep/del-pushers
clokep Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/9121.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix spurious errors in logs when deleting a non-existant pusher.
4 changes: 3 additions & 1 deletion synapse/storage/databases/main/pusher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,9 @@ def delete_pusher_txn(txn, stream_id):
txn, self.get_if_user_has_pusher, (user_id,)
)

self.db_pool.simple_delete_one_txn(
# It is expected that there is exactly one pusher to delete, but
# if it isn't there (or there are multiple) delete them all.
self.db_pool.simple_delete_txn(
txn,
"pushers",
{"app_id": app_id, "pushkey": pushkey, "user_name": user_id},
Expand Down