summary refs log tree commit diff
path: root/synapse/handlers/device.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-02-05 14:02:39 +0000
committerGitHub <noreply@github.com>2020-02-05 14:02:39 +0000
commita58860e4802c31680ba43e59ec537984af9f5637 (patch)
tree6ce866b4a3fe84f5ad829da20a912b3c216ac1fc /synapse/handlers/device.py
parentMerge pull request #6844 from matrix-org/uhoreg/cross_signing_fix_device_fed (diff)
downloadsynapse-a58860e4802c31680ba43e59ec537984af9f5637.tar.xz
Check sender_key matches on inbound encrypted events. (#6850)
If they don't then the device lists are probably out of sync.
Diffstat (limited to 'synapse/handlers/device.py')
-rw-r--r--synapse/handlers/device.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index 26ef5e150c..a9bd431486 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -598,7 +598,13 @@ class DeviceListUpdater(object):
             # happens if we've missed updates.
             resync = yield self._need_to_do_resync(user_id, pending_updates)
 
-            logger.debug("Need to re-sync devices for %r? %r", user_id, resync)
+            if logger.isEnabledFor(logging.INFO):
+                logger.info(
+                    "Received device list update for %s, requiring resync: %s. Devices: %s",
+                    user_id,
+                    resync,
+                    ", ".join(u[0] for u in pending_updates),
+                )
 
             if resync:
                 yield self.user_device_resync(user_id)