Add paranoia exception catch in Linearizer

2017-01-10 14:04:13 +00:00 · 2017-01-10 14:04:13 +00:00 · f477370c0c
parent 9898bbd9dc
commit f477370c0c
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)