summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-11-16 16:03:38 +0000
committerRichard van der Hoff <richard@matrix.org>2017-11-16 16:03:38 +0000
commit77a122787022c302f0b2abcb63bd2f7d8514d692 (patch)
treea8d550b51e468e2d316185cb069b76880713317a
parentAvoid locking `pushers` table on upsert (diff)
downloadsynapse-77a122787022c302f0b2abcb63bd2f7d8514d692.tar.xz
Fix broken ref to IntegrityError
-rw-r--r--synapse/storage/_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py

index 1582a58966..e6eefdd6fe 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py
@@ -503,7 +503,7 @@ class SQLBaseStore(object): lock=lock ) defer.returnValue(result) - except self.database_engine.IntegrityError as e: + except self.database_engine.module.IntegrityError as e: # presumably we raced with another transaction: let's retry. logger.warn( "IntegrityError when upserting into %s; retrying: %s",