summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-06-03 18:07:19 +0100
committerRichard van der Hoff <richard@matrix.org>2019-06-04 00:16:56 +0100
commitc5d60eadd5949ab4c12857e0830eb0afbb857f72 (patch)
treedc95812fe39f653d013842f466fceb905c9ff930 /synapse/crypto
parentDon't bomb out on direct key fetches as soon as one fails (diff)
downloadsynapse-c5d60eadd5949ab4c12857e0830eb0afbb857f72.tar.xz
Notary server: make requests to origins in parallel
... else we're guaranteed to time out.
Diffstat (limited to 'synapse/crypto')
-rw-r--r--synapse/crypto/keyring.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
index 5660c96023..6dae713ebc 100644
--- a/synapse/crypto/keyring.py
+++ b/synapse/crypto/keyring.py
@@ -751,7 +751,15 @@ class ServerKeyFetcher(BaseV2KeyFetcher):
         self.client = hs.get_http_client()
 
     def get_keys(self, keys_to_fetch):
-        """see KeyFetcher.get_keys"""
+        """
+        Args:
+            keys_to_fetch (dict[str, iterable[str]]):
+                the keys to be fetched. server_name -> key_ids
+
+        Returns:
+            Deferred[dict[str, dict[str, synapse.storage.keys.FetchKeyResult|None]]]:
+                map from server_name -> key_id -> FetchKeyResult
+        """
 
         results = {}