Add unwrapFirstError

2015-06-25 11:57:54 +01:00 · 2015-06-25 11:57:54 +01:00 · 9951f43764
parent 9e6daddaf5
commit 9951f43764
1 changed files with 7 additions and 4 deletions
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@ -291,10 +291,13 @@ class Keyring(object):

            defer.returnValue(keys)

-        results = yield defer.gatherResults([
-            get_key(server_name, key_ids)
-            for server_name, key_ids in server_name_and_key_ids
-        ])
+        results = yield defer.gatherResults(
+            [
+                get_key(server_name, key_ids)
+                for server_name, key_ids in server_name_and_key_ids
+            ],
+            consumeErrors=True,
+        ).addErrback(unwrapFirstError)

        merged = {}
        for result in results: