summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-01-13 15:36:55 +0000
committerErik Johnston <erik@matrix.org>2020-01-13 15:36:55 +0000
commitf0ff85491184baa70318d15ef8c49ea46675d2f3 (patch)
tree40330e8ba18d8701e0980067b37b214bc89079ae
parentLog received 'm.room_key_request' EDUs (diff)
downloadsynapse-f0ff85491184baa70318d15ef8c49ea46675d2f3.tar.xz
Pull out more info about room key requests
-rw-r--r--synapse/handlers/devicemessage.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/synapse/handlers/devicemessage.py b/synapse/handlers/devicemessage.py
index 4a7b2328c1..2fa906914c 100644
--- a/synapse/handlers/devicemessage.py
+++ b/synapse/handlers/devicemessage.py
@@ -89,13 +89,19 @@ class DeviceMessageHandler(object):
                 # didn't know about the sender's device (or might just mean
                 # things are being a bit slow to propogate).
                 received_devices = set(by_device)
-                sender_key = list(by_device.values())[0].get("sender_key", "<unknown>")
+                requesting_device_id = list(by_device.values())[0].get(
+                    "requesting_device_id", "<unknown>"
+                )
+                request_id = list(by_device.values())[0].get("request_id", "<unknown>")
+                action = list(by_device.values())[0].get("action", "<unknown>")
                 device_list_debugging_logger.info(
-                    "Received room_key request direct message (%s, %s) from %s (%s) to %s (%s).",
+                    "Received room_key %s direct message (%s, %s, %s) from %s (%s) to %s (%s).",
+                    action,
                     message_type,
                     message_id,
+                    request_id,
                     sender_user_id,
-                    sender_key,
+                    requesting_device_id,
                     user_id,
                     received_devices,
                 )