summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-05 15:22:24 +0100
committerGitHub <noreply@github.com>2019-09-05 15:22:24 +0100
commit1a6ae333090c5b34ab6a3e0427dfc87ed99d6a9c (patch)
tree0c1b096f70c9d7743049765fdc31639001fa84ea /synapse/storage
parentAdd opentracing to all client servlets (#5983) (diff)
parentuse access methods (duh..) (diff)
downloadsynapse-1a6ae333090c5b34ab6a3e0427dfc87ed99d6a9c.tar.xz
Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_contexts
Link the send loop with the edus contexts
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/devices.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py
index 41f62828bd..79a58df591 100644
--- a/synapse/storage/devices.py
+++ b/synapse/storage/devices.py
@@ -856,7 +856,7 @@ class DeviceStore(DeviceWorkerStore, BackgroundUpdateStore):
                     "ts": now,
                     "opentracing_context": json.dumps(context)
                     if whitelisted_homeserver(destination)
-                    else None,
+                    else "{}",
                 }
                 for destination in hosts
                 for device_id in device_ids