summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2020-08-20 10:32:33 -0400
committerGitHub <noreply@github.com>2020-08-20 10:32:33 -0400
commitdbc630a628e4fc6eb5eff09ce5edba062c0e9955 (patch)
tree2763c1411e608531526b269f9a2746121e117774 /synapse/handlers
parentAdd more types to synapse.storage.database. (#8127) (diff)
downloadsynapse-dbc630a628e4fc6eb5eff09ce5edba062c0e9955.tar.xz
Use the JSON encoder without whitespace in more places. (#8124)
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/devicemessage.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/devicemessage.py b/synapse/handlers/devicemessage.py
index 610b08d00b..dcb4c82244 100644
--- a/synapse/handlers/devicemessage.py
+++ b/synapse/handlers/devicemessage.py
@@ -16,8 +16,6 @@
 import logging
 from typing import Any, Dict
 
-from canonicaljson import json
-
 from synapse.api.errors import SynapseError
 from synapse.logging.context import run_in_background
 from synapse.logging.opentracing import (
@@ -27,6 +25,7 @@ from synapse.logging.opentracing import (
     start_active_span,
 )
 from synapse.types import UserID, get_domain_from_id
+from synapse.util import json_encoder
 from synapse.util.stringutils import random_string
 
 logger = logging.getLogger(__name__)
@@ -174,7 +173,7 @@ class DeviceMessageHandler(object):
                     "sender": sender_user_id,
                     "type": message_type,
                     "message_id": message_id,
-                    "org.matrix.opentracing_context": json.dumps(context),
+                    "org.matrix.opentracing_context": json_encoder.encode(context),
                 }
 
         log_kv({"local_messages": local_messages})