diff options
| author | Erik Johnston <erik@matrix.org> | 2016-07-29 11:24:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-07-29 11:24:56 +0100 |
| commit | 5aa024e50132924d50229c633249a17eff9180f1 (patch) | |
| tree | 5b0ee152c49f6a772bcb4e133fd4649aa612bda3 /synapse/storage/transactions.py | |
| parent | Add destination retry to slave store (diff) | |
| parent | Merge pull request #966 from matrix-org/markjh/fix_push (diff) | |
| download | synapse-5aa024e50132924d50229c633249a17eff9180f1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
Diffstat (limited to 'synapse/storage/transactions.py')
| -rw-r--r-- | synapse/storage/transactions.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py index 6c7481a728..6258ff1725 100644 --- a/synapse/storage/transactions.py +++ b/synapse/storage/transactions.py @@ -24,6 +24,7 @@ from collections import namedtuple import itertools import logging +import ujson as json logger = logging.getLogger(__name__) @@ -101,7 +102,7 @@ class TransactionStore(SQLBaseStore): ) if result and result["response_code"]: - return result["response_code"], result["response_json"] + return result["response_code"], json.loads(str(result["response_json"])) else: return None |