OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Add unwrapFirstError

erikj/persist_event_perf
Erik Johnston 2015-06-25 11:57:54 +01:00
parent 9e6daddaf5
commit 9951f43764
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
synapse/crypto/keyring.py
View File

@ -291,10 +291,13 @@ class Keyring(object):
defer.returnValue(keys) defer.returnValue(keys)
results = yield defer.gatherResults([ results = yield defer.gatherResults(
get_key(server_name, key_ids) [
for server_name, key_ids in server_name_and_key_ids get_key(server_name, key_ids)
]) for server_name, key_ids in server_name_and_key_ids
],
consumeErrors=True,
).addErrback(unwrapFirstError)
merged = {} merged = {}
for result in results: for result in results: