diff options
| author | Erik Johnston <erik@matrix.org> | 2020-06-15 16:42:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 16:42:21 +0100 |
| commit | 4241a106739b91092bf39cdc407c0971c256390c (patch) | |
| tree | 55e335c1b8a1751eee799c6ed164684c719d4dfc | |
| parent | Discard RDATA from already seen positions. (#7648) (diff) | |
| download | synapse-4241a106739b91092bf39cdc407c0971c256390c.tar.xz | |
Fix "There was no active span when trying to log." error (#7698)
| -rw-r--r-- | changelog.d/7698.bugfix | 1 | ||||
| -rw-r--r-- | synapse/handlers/device.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/7698.bugfix b/changelog.d/7698.bugfix new file mode 100644 index 0000000000..32de7459eb --- /dev/null +++ b/changelog.d/7698.bugfix @@ -0,0 +1 @@ +Fix logged error during device resync in opentracing. Broke in v1.14.0. diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index 83f8fa1180..31346b56c3 100644 --- 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 |