From 7a0fd6f98df48932f0af52d9396f085ac96ff9a2 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Fri, 30 Oct 2020 16:50:48 +0000 Subject: [PATCH] Fix error handling around when completing an AS transaction (#8693) --- changelog.d/8693.misc | 1 + synapse/storage/databases/main/appservice.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/8693.misc diff --git a/changelog.d/8693.misc b/changelog.d/8693.misc new file mode 100644 index 000000000..b588bdd3e --- /dev/null +++ b/changelog.d/8693.misc @@ -0,0 +1 @@ +Add more type hints to the application services code. diff --git a/synapse/storage/databases/main/appservice.py b/synapse/storage/databases/main/appservice.py index 26eef6eb6..e550cbc86 100644 --- a/synapse/storage/databases/main/appservice.py +++ b/synapse/storage/databases/main/appservice.py @@ -261,7 +261,7 @@ class ApplicationServiceTransactionWorkerStore( # 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 "