mirror of
https://mau.dev/maunium/synapse.git
synced 2024-09-04 08:32:29 +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
@ -275,7 +275,8 @@ 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():
|
||||||
|
for group in groups:
|
||||||
group_id_to_deferred[group.group_id].errback(SynapseError(
|
group_id_to_deferred[group.group_id].errback(SynapseError(
|
||||||
401,
|
401,
|
||||||
"No key for %s with id %s" % (
|
"No key for %s with id %s" % (
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user