1
0

reraise exceptions and raise logging level on except

This commit is contained in:
Neil Johnson
2019-01-07 15:48:06 +00:00
parent bc1fa8cd01
commit 1e78846664
2 changed files with 5 additions and 4 deletions

1
changelog.d/4354.bugfix Normal file
View File

@@ -0,0 +1 @@
Improve logging to synapse.storage._base._new_transaction not to swallow exceptions

View File

@@ -264,7 +264,7 @@ class SQLBaseStore(object):
name, exception_to_unicode(e1),
)
continue
raise
raise e
except self.database_engine.module.DatabaseError as e:
if self.database_engine.is_deadlock(e):
logger.warning("[TXN DEADLOCK] {%s} %d/%d", name, i, N)
@@ -278,10 +278,10 @@ class SQLBaseStore(object):
name, exception_to_unicode(e1),
)
continue
raise
raise e
except Exception as e:
logger.debug("[TXN FAIL] {%s} %s", name, e)
raise
logger.exception("[TXN FAIL] {%s} %s", name, exception_to_unicode(e))
raise e
finally:
end = time.time()
duration = end - start