mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-29 15:39:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix sending opentracing contexts to remote servers (#12555)

Browse source
This commit is contained in:
Erik Johnston 2022-04-26 15:48:16 +01:00 committed by GitHub
parent ee1601e59d
commit c48ab3734e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/12555.bugfix Normal file
View file

@ -0,0 +1 @@
Fix sending opentracing contexts to whitelisted remote servers with device lists updates. Broken in v1.58.0rc1.

12
synapse/storage/databases/main/devices.py
View file

@ -1776,7 +1776,17 @@ class DeviceStore(DeviceWorkerStore, DeviceBackgroundUpdateStore):
def get_uncoverted_outbound_room_pokes_txn(txn): def get_uncoverted_outbound_room_pokes_txn(txn):
txn.execute(sql, (limit,)) 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( return await self.db_pool.runInteraction(
"get_uncoverted_outbound_room_pokes", get_uncoverted_outbound_room_pokes_txn "get_uncoverted_outbound_room_pokes", get_uncoverted_outbound_room_pokes_txn