mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 09:10:52 +00:00
Merge pull request #954 from matrix-org/markjh/even_more_fixes
Fix a couple of bugs in the transaction and keyring code
This commit is contained in:
commit
09d31815b4
2 changed files with 11 additions and 9 deletions
|
@ -275,14 +275,15 @@ class Keyring(object):
|
|||
for server_name, groups in missing_groups.items()
|
||||
}
|
||||
|
||||
for group in missing_groups.values():
|
||||
group_id_to_deferred[group.group_id].errback(SynapseError(
|
||||
401,
|
||||
"No key for %s with id %s" % (
|
||||
group.server_name, group.key_ids,
|
||||
),
|
||||
Codes.UNAUTHORIZED,
|
||||
))
|
||||
for groups in missing_groups.values():
|
||||
for group in groups:
|
||||
group_id_to_deferred[group.group_id].errback(SynapseError(
|
||||
401,
|
||||
"No key for %s with id %s" % (
|
||||
group.server_name, group.key_ids,
|
||||
),
|
||||
Codes.UNAUTHORIZED,
|
||||
))
|
||||
|
||||
def on_err(err):
|
||||
for deferred in group_id_to_deferred.values():
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue