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

2020-06-15 16:42:21 +01:00 · 2020-06-15 16:42:21 +01:00 · 4241a10673
parent 7d2532be36
commit 4241a10673
2 changed files with 2 additions and 0 deletions
--- a/changelog.d/7698.bugfix
+++ b/changelog.d/7698.bugfix
@ -0,0 +1 @@
+Fix logged error during device resync in opentracing. Broke in v1.14.0.
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@ -691,6 +691,7 @@ class DeviceListUpdater(object):

        return False

+    @trace
    @defer.inlineCallbacks
    def _maybe_retry_device_resync(self):
        """Retry to resync device lists that are out of sync, except if another retry is
				`@ -0,0 +1 @@`
				`Fix logged error during device resync in opentracing. Broke in v1.14.0.`