summary refs log tree commit diff
path: root/synapse/storage/databases/main
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2022-04-26 15:48:16 +0100
committerGitHub <noreply@github.com>2022-04-26 14:48:16 +0000
commitc48ab3734ee57fcf0841d814680e50e49948cafe (patch)
tree5d60b4f8e34884436c66abd63ab67d44466521c5 /synapse/storage/databases/main
parentUnbold deprecation: it is mentioned at the top (diff)
downloadsynapse-c48ab3734ee57fcf0841d814680e50e49948cafe.tar.xz
Fix sending opentracing contexts to remote servers (#12555)
Diffstat (limited to 'synapse/storage/databases/main')
-rw-r--r--synapse/storage/databases/main/devices.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/devices.py b/synapse/storage/databases/main/devices.py
index 318e4df376..59d223a900 100644
--- a/synapse/storage/databases/main/devices.py
+++ b/synapse/storage/databases/main/devices.py
@@ -1776,7 +1776,17 @@ class DeviceStore(DeviceWorkerStore, DeviceBackgroundUpdateStore):
 
         def get_uncoverted_outbound_room_pokes_txn(txn):
             txn.execute(sql, (limit,))
-            return txn.fetchall()
+
+            return [
+                (
+                    user_id,
+                    device_id,
+                    room_id,
+                    stream_id,
+                    db_to_json(opentracing_context),
+                )
+                for user_id, device_id, room_id, stream_id, opentracing_context in txn
+            ]
 
         return await self.db_pool.runInteraction(
             "get_uncoverted_outbound_room_pokes", get_uncoverted_outbound_room_pokes_txn