Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-19 17:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #954 from matrix-org/markjh/even_more_fixes

Browse Source 
Fix a couple of bugs in the transaction and keyring code
This commit is contained in:
Mark Haines 2016-07-27 15:08:14 +01:00 committed by GitHub
commit 09d31815b4
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
synapse/crypto/keyring.py
View File

@ -275,14 +275,15 @@ class Keyring(object):
for server_name, groups in missing_groups.items() for server_name, groups in missing_groups.items()
} }
for group in missing_groups.values(): for groups in missing_groups.values():
group_id_to_deferred[group.group_id].errback(SynapseError( for group in groups:
401, group_id_to_deferred[group.group_id].errback(SynapseError(
"No key for %s with id %s" % ( 401,
group.server_name, group.key_ids, "No key for %s with id %s" % (
), group.server_name, group.key_ids,
Codes.UNAUTHORIZED, ),
)) Codes.UNAUTHORIZED,
))
def on_err(err): def on_err(err):
for deferred in group_id_to_deferred.values(): for deferred in group_id_to_deferred.values():

3
synapse/storage/transactions.py
View File

@ -24,6 +24,7 @@ from collections import namedtuple
import itertools import itertools
import logging import logging
import ujson as json
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -101,7 +102,7 @@ class TransactionStore(SQLBaseStore):
) )
if result and result["response_code"]: if result and result["response_code"]:
return result["response_code"], result["response_json"] return result["response_code"], json.loads(str(result["response_json"]))
else: else:
return None return None