summary refs log tree commit diff
path: root/synapse/util/async.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2016-12-31 02:38:26 +0000
committerMatthew Hodgson <matthew@matrix.org>2016-12-31 02:38:26 +0000
commit899a3a126857e94a16fda65cd11b5b5c4efeed01 (patch)
tree56e3527cd9e9c62a71cee6d9064d3704f0e11ef2 /synapse/util/async.py
parentMerge remote-tracking branch 'origin/release-v0.18.6' into develop (diff)
parentBump version and changelog (diff)
downloadsynapse-899a3a126857e94a16fda65cd11b5b5c4efeed01.tar.xz
Merge branch 'release-v0.18.6' into develop
Diffstat (limited to 'synapse/util/async.py')
-rw-r--r--synapse/util/async.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/util/async.py b/synapse/util/async.py
index 16ed183d4c..4280455cbe 100644
--- a/synapse/util/async.py
+++ b/synapse/util/async.py
@@ -23,6 +23,10 @@ from synapse.util import unwrapFirstError
 
 from contextlib import contextmanager
 
+import logging
+
+logger = logging.getLogger(__name__)
+
 
 @defer.inlineCallbacks
 def sleep(seconds):
@@ -181,6 +185,7 @@ class Linearizer(object):
         self.key_to_defer[key] = new_defer
 
         if current_defer:
+            logger.info("Waiting to acquire linearizer lock for key %r", key)
             with PreserveLoggingContext():
                 yield current_defer