summary refs log tree commit diff
path: root/synapse/event_auth.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/event_auth.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/event_auth.py')
-rw-r--r--synapse/event_auth.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/event_auth.py b/synapse/event_auth.py
index e7b722547b..ec3243b27b 100644
--- a/synapse/event_auth.py
+++ b/synapse/event_auth.py
@@ -77,7 +77,7 @@ def check(room_version, event, auth_events, do_sig_check=True, do_size_check=Tru
     if auth_events is None:
         # Oh, we don't know what the state of the room was, so we
         # are trusting that this is allowed (at least for now)
-        logger.warn("Trusting event: %s", event.event_id)
+        logger.warning("Trusting event: %s", event.event_id)
         return
 
     if event.type == EventTypes.Create: