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

Add paranoia exception catch in Linearizer
2017-01-10 15:38:30 +00:00 · 2017-01-10 15:38:30 +00:00 · d2b00d0866
parent 024eb98524 f477370c0c
commit d2b00d0866
1 changed files with 5 additions and 2 deletions
--- a/synapse/util/async.py
+++ b/synapse/util/async.py
@ -192,8 +192,11 @@ class Linearizer(object):
            logger.info(
                "Waiting to acquire linearizer lock %r for key %r", self.name, key
            )
-            with PreserveLoggingContext():
-                yield current_defer
+            try:
+                with PreserveLoggingContext():
+                    yield current_defer
+            except:
+                logger.exception("Unexpected exception in Linearizer")

        logger.info("Acquired linearizer lock %r for key %r", self.name, key)