diff options
| author | Erik Johnston <erik@matrix.org> | 2022-04-26 15:48:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-26 14:48:16 +0000 |
| commit | c48ab3734ee57fcf0841d814680e50e49948cafe (patch) | |
| tree | 5d60b4f8e34884436c66abd63ab67d44466521c5 | |
| parent | Unbold deprecation: it is mentioned at the top (diff) | |
| download | synapse-c48ab3734ee57fcf0841d814680e50e49948cafe.tar.xz | |
Fix sending opentracing contexts to remote servers (#12555)
| -rw-r--r-- | changelog.d/12555.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/databases/main/devices.py | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/changelog.d/12555.bugfix b/changelog.d/12555.bugfix new file mode 100644 index 0000000000..3c721da1ee --- /dev/null +++ b/changelog.d/12555.bugfix @@ -0,0 +1 @@ +Fix sending opentracing contexts to whitelisted remote servers with device lists updates. Broken in v1.58.0rc1. 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 |