summary refs log tree commit diff
path: root/synapse/util/async_helpers.py
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-10-31 22:38:21 -0400
committerHubert Chathi <hubert@uhoreg.ca>2019-10-31 22:38:21 -0400
commit6f4bc6d01d6eed5211021fd29ef152f96c03c357 (patch)
tree1f0a6e344096d8f40283be7c1e74be6eb45735ca /synapse/util/async_helpers.py
parentrename get_devices_by_remote to get_device_updates_by_remote (diff)
parentMerge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notify (diff)
downloadsynapse-6f4bc6d01d6eed5211021fd29ef152f96c03c357.tar.xz
Merge branch 'develop' into cross-signing_federation
Diffstat (limited to 'synapse/util/async_helpers.py')
-rw-r--r--synapse/util/async_helpers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/async_helpers.py b/synapse/util/async_helpers.py
index b60a604474..5c4de2e69f 100644
--- a/synapse/util/async_helpers.py
+++ b/synapse/util/async_helpers.py
@@ -309,7 +309,7 @@ class Linearizer(object):
                 )
 
             else:
-                logger.warn(
+                logger.warning(
                     "Unexpected exception waiting for linearizer lock %r for key %r",
                     self.name,
                     key,