summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-04-05 11:10:28 +0100
committerErik Johnston <erik@matrix.org>2017-04-05 11:10:28 +0100
commitf10ce8944b8ef4c33694654c397bfcda44c6124a (patch)
treec26e86da4146c998818b5b5e2d2755149759e666 /synapse/app
parentMerge pull request #2097 from matrix-org/erikj/repl_tcp_client (diff)
downloadsynapse-f10ce8944b8ef4c33694654c397bfcda44c6124a.tar.xz
Don't double json encode federation replication data
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/federation_sender.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/app/federation_sender.py b/synapse/app/federation_sender.py
index cbddc80ca9..145c01f3a3 100644
--- a/synapse/app/federation_sender.py
+++ b/synapse/app/federation_sender.py
@@ -51,7 +51,6 @@ from daemonize import Daemonize
 import sys
 import logging
 import gc
-import ujson as json
 
 logger = logging.getLogger("synapse.app.appservice")
 
@@ -290,8 +289,7 @@ class FederationSenderHandler(object):
             # Parse the rows in the stream
             for row in rows:
                 typ = row.type
-                content_js = row.data
-                content = json.loads(content_js)
+                content = row.data
 
                 if typ == send_queue.PRESENCE_TYPE:
                     destination = content["destination"]