summary refs log tree commit diff
path: root/synapse/storage/databases
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-10-31 10:54:23 +0000
committerRichard van der Hoff <richard@matrix.org>2020-10-31 10:54:23 +0000
commitce2107eee1f9df7cfea1a26b4d22a57ac90f2450 (patch)
treeef5138662cb40d86f3cbd11da600a4ead4392b30 /synapse/storage/databases
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentFix SIGHUP handler (diff)
downloadsynapse-ce2107eee1f9df7cfea1a26b4d22a57ac90f2450.tar.xz
Merge branch 'rav/fix_sighup' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/databases')
-rw-r--r--synapse/storage/databases/main/appservice.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/appservice.py b/synapse/storage/databases/main/appservice.py

index 26eef6eb61..e550cbc866 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 "