diff options
| author | Jorik Schellekens <joriks@matrix.org> | 2019-07-17 11:52:27 +0100 |
|---|---|---|
| committer | Jorik Schellekens <joriks@matrix.org> | 2019-07-23 16:06:33 +0100 |
| commit | d26cbb4e236a2544a8d9d0980b2be0309356039a (patch) | |
| tree | cef178e5eeefd89c3d2fd927b543054915bf48c5 | |
| parent | Make sure there is an active span here. (diff) | |
| download | synapse-d26cbb4e236a2544a8d9d0980b2be0309356039a.tar.xz | |
Unbreak json parsing.
| -rw-r--r-- | synapse/handlers/devicemessage.py | 2 | ||||
| -rw-r--r-- | synapse/storage/devices.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/devicemessage.py b/synapse/handlers/devicemessage.py index 5963df4c1c..625b1b70af 100644 --- a/synapse/handlers/devicemessage.py +++ b/synapse/handlers/devicemessage.py @@ -118,7 +118,7 @@ class DeviceMessageHandler(object): "message_id": message_id, "context": json.dumps(context) if opentracing.whitelisted_homeserver(destination) - else "", + else "{}", } opentracing.log_kv({"local_messages": local_messages}) diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py index c81b3b8fc8..671b80624b 100644 --- a/synapse/storage/devices.py +++ b/synapse/storage/devices.py @@ -222,7 +222,7 @@ class DeviceWorkerStore(SQLBaseStore): "stream_id": stream_id, "context": query_map[(user_id, device_id)][1] if opentracing.whitelisted_homeserver(destination) - else "", + else "{}", } prev_id = stream_id @@ -841,7 +841,7 @@ class DeviceStore(DeviceWorkerStore, BackgroundUpdateStore): "ts": now, "context": json.dumps(context) if opentracing.whitelisted_homeserver(destination) - else "", + else "{}", } for destination in hosts for device_id in device_ids |