OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix error handling around when completing an AS transaction (#8693)

erikj/release_script
Brendan Abolivier 2020-10-30 16:50:48 +00:00 committed by GitHub
parent f27a789697
commit 7a0fd6f98d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/8693.misc Normal file
View File

@ -0,0 +1 @@
Add more type hints to the application services code.

2
synapse/storage/databases/main/appservice.py
View File

@ -261,7 +261,7 @@ class ApplicationServiceTransactionWorkerStore(
# has probably missed some events), so whine loudly but still continue, # has probably missed some events), so whine loudly but still continue,
# since it shouldn't fail completion of the transaction. # since it shouldn't fail completion of the transaction.
last_txn_id = self._get_last_txn(txn, service.id) 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( logger.error(
"appservice: Completing a transaction which has an ID > 1 from " "appservice: Completing a transaction which has an ID > 1 from "
"the last ID sent to this AS. We've either dropped events or " "the last ID sent to this AS. We've either dropped events or "