summary refs log tree commit diff
path: root/synapse/app/federation_sender.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-04-07 09:39:52 +0100
committerGitHub <noreply@github.com>2017-04-07 09:39:52 +0100
commit98ce212093bbe87c8cd2b5c92ee1587aba5cc1fa (patch)
treea6d9b00000e962c0a7e87bfe3d4a498f3f825641 /synapse/app/federation_sender.py
parentUse iteritems (diff)
parentDocument types of the replication streams (diff)
downloadsynapse-98ce212093bbe87c8cd2b5c92ee1587aba5cc1fa.tar.xz
Merge pull request #2103 from matrix-org/erikj/no-double-encode
Don't double encode replication data
Diffstat (limited to 'synapse/app/federation_sender.py')
-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"]