summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-05 18:20:01 +0100
committerErik Johnston <erik@matrix.org>2015-05-05 18:20:01 +0100
commit0cf7e480b442f9f893b782ab1a437b556c1bbb54 (patch)
treeadffd54138cb4d537edb45f2d715e26a391edb76
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/executemany (diff)
downloadsynapse-0cf7e480b442f9f893b782ab1a437b556c1bbb54.tar.xz
And use buffer(...) there as well
-rw-r--r--synapse/federation/persistence.py2
-rw-r--r--synapse/storage/transactions.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py
index 865766eb2c..1a7cc02f92 100644
--- a/synapse/federation/persistence.py
+++ b/synapse/federation/persistence.py
@@ -99,5 +99,5 @@ class TransactionActions(object):
             transaction.transaction_id,
             transaction.destination,
             response_code,
-            encode_canonical_json(response_dict)
+            response_dict,
         )
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py
index b5b21a9b13..624da4a9dc 100644
--- a/synapse/storage/transactions.py
+++ b/synapse/storage/transactions.py
@@ -162,7 +162,8 @@ class TransactionStore(SQLBaseStore):
         return self.runInteraction(
             "delivered_txn",
             self._delivered_txn,
-            transaction_id, destination, code, response_dict
+            transaction_id, destination, code,
+            buffer(encode_canonical_json(response_dict)),
         )
 
     def _delivered_txn(self, txn, transaction_id, destination,