Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix "There was no active span when trying to log." error (#7698)

This commit is contained in:
Erik Johnston 2020-06-15 16:42:21 +01:00 committed by GitHub
parent 7d2532be36
commit 4241a10673
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7698.bugfix Normal file
View File

@ -0,0 +1 @@
Fix logged error during device resync in opentracing. Broke in v1.14.0.

1
synapse/handlers/device.py
View File

@ -691,6 +691,7 @@ class DeviceListUpdater(object):
return False return False
@trace
@defer.inlineCallbacks @defer.inlineCallbacks
def _maybe_retry_device_resync(self): def _maybe_retry_device_resync(self):
"""Retry to resync device lists that are out of sync, except if another retry is """Retry to resync device lists that are out of sync, except if another retry is