diff options
| author | Antonio Russo <aerusso@aerusso.net> | 2024-03-19 22:40:43 -0600 |
|---|---|---|
| committer | Antonio Russo <aerusso@aerusso.net> | 2024-03-19 22:40:43 -0600 |
| commit | 3357e3b433f9a4412dcf793eff29395008a89ca4 (patch) | |
| tree | f5ebc22236c8ba40083006512f9da75bcf43d04e /synapse/crypto/keyring.py | |
| parent | 3a916c407ead78d95cf0acb7c9c0a4a505557b5e (diff) | |
New upstream version 1.103.0
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 1e7e5f70..8c301e07 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -839,11 +839,12 @@ class ServerKeyFetcher(BaseV2KeyFetcher): Map from server_name -> key_id -> FetchKeyResult """ - results = {} + # We only need to do one request per server. + servers_to_fetch = {k.server_name for k in keys_to_fetch} - async def get_keys(key_to_fetch_item: _FetchKeyRequest) -> None: - server_name = key_to_fetch_item.server_name + results = {} + async def get_keys(server_name: str) -> None: try: keys = await self.get_server_verify_keys_v2_direct(server_name) results[server_name] = keys @@ -852,7 +853,7 @@ class ServerKeyFetcher(BaseV2KeyFetcher): except Exception: logger.exception("Error getting keys from %s", server_name) - await yieldable_gather_results(get_keys, keys_to_fetch) + await yieldable_gather_results(get_keys, servers_to_fetch) return results async def get_server_verify_keys_v2_direct( |