Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1790 from matrix-org/erikj/linearizer

Browse Source 
Add paranoia exception catch in Linearizer
This commit is contained in:
Erik Johnston 2017-01-10 15:38:30 +00:00 committed by GitHub
commit d2b00d0866
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/util/async.py
View File

@ -192,8 +192,11 @@ class Linearizer(object):
logger.info( logger.info(
"Waiting to acquire linearizer lock %r for key %r", self.name, key "Waiting to acquire linearizer lock %r for key %r", self.name, key
) )
with PreserveLoggingContext(): try:
yield current_defer with PreserveLoggingContext():
yield current_defer
except:
logger.exception("Unexpected exception in Linearizer")
logger.info("Acquired linearizer lock %r for key %r", self.name, key) logger.info("Acquired linearizer lock %r for key %r", self.name, key)