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

Fix error handling around when completing an AS transaction #8693

Merged
merged 2 commits into from
Oct 30, 2020
Merged

Fix error handling around when completing an AS transaction #8693

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0807262
Fix error handling around when completing an AS transaction
babolivier Oct 30, 2020
afc8e5a
Merge branch 'develop' into babolivier/appservice_txn
babolivier Oct 30, 2020
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/8693.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add more type hints to the application services code.
2 changes: 1 addition & 1 deletion synapse/storage/databases/main/appservice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def _complete_appservice_txn(txn):
# has probably missed some events), so whine loudly but still continue,
# since it shouldn't fail completion of the transaction.
last_txn_id = self._get_last_txn(txn, service.id)
if (txn_id + 1) != txn_id:
if (last_txn_id + 1) != txn_id:
logger.error(
"appservice: Completing a transaction which has an ID > 1 from "
"the last ID sent to this AS. We've either dropped events or "
Expand Down