Fix error handling around when completing an AS transaction (matrix-o…

…rg#8693)
callahad · Oct 30, 2020 · 7a0fd6f · 7a0fd6f
1 parent f27a789
commit 7a0fd6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/8693.misc 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
@@ -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 "
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add more type hints to the application services code.