Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit c48ab37

Browse files
authored
Fix sending opentracing contexts to remote servers (#12555)
1 parent ee1601e commit c48ab37

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

changelog.d/12555.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix sending opentracing contexts to whitelisted remote servers with device lists updates. Broken in v1.58.0rc1.

synapse/storage/databases/main/devices.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1776,7 +1776,17 @@ async def get_uncoverted_outbound_room_pokes(
17761776

17771777
def get_uncoverted_outbound_room_pokes_txn(txn):
17781778
txn.execute(sql, (limit,))
1779-
return txn.fetchall()
1779+
1780+
return [
1781+
(
1782+
user_id,
1783+
device_id,
1784+
room_id,
1785+
stream_id,
1786+
db_to_json(opentracing_context),
1787+
)
1788+
for user_id, device_id, room_id, stream_id, opentracing_context in txn
1789+
]
17801790

17811791
return await self.db_pool.runInteraction(
17821792
"get_uncoverted_outbound_room_pokes", get_uncoverted_outbound_room_pokes_txn

0 commit comments

Comments
 (0)