mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 02:10:55 +00:00
Factor out _start_key_lookups
... to make it easier to see what's going on.
This commit is contained in:
parent
fde63b880d
commit
3b98439eca
1 changed files with 17 additions and 7 deletions
|
@ -122,6 +122,23 @@ class Keyring(object):
|
||||||
|
|
||||||
verify_requests.append(verify_request)
|
verify_requests.append(verify_request)
|
||||||
|
|
||||||
|
self._start_key_lookups(verify_requests)
|
||||||
|
|
||||||
|
# Pass those keys to handle_key_deferred so that the json object
|
||||||
|
# signatures can be verified
|
||||||
|
return [
|
||||||
|
preserve_context_over_fn(_handle_key_deferred, rq)
|
||||||
|
for rq in verify_requests
|
||||||
|
]
|
||||||
|
|
||||||
|
def _start_key_lookups(self, verify_requests):
|
||||||
|
"""Sets off the key fetches for each verify request
|
||||||
|
|
||||||
|
Once each fetch completes, verify_request.deferred will be resolved.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
verify_requests (List[VerifyKeyRequest]):
|
||||||
|
"""
|
||||||
server_to_deferred = {
|
server_to_deferred = {
|
||||||
rq.server_name: defer.Deferred()
|
rq.server_name: defer.Deferred()
|
||||||
for rq in verify_requests
|
for rq in verify_requests
|
||||||
|
@ -163,13 +180,6 @@ class Keyring(object):
|
||||||
remove_deferreds, server_name, verify_request,
|
remove_deferreds, server_name, verify_request,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Pass those keys to handle_key_deferred so that the json object
|
|
||||||
# signatures can be verified
|
|
||||||
return [
|
|
||||||
preserve_context_over_fn(_handle_key_deferred, verify_request)
|
|
||||||
for verify_request in verify_requests
|
|
||||||
]
|
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def wait_for_previous_lookups(self, server_names, server_to_deferred):
|
def wait_for_previous_lookups(self, server_names, server_to_deferred):
|
||||||
"""Waits for any previous key lookups for the given servers to finish.
|
"""Waits for any previous key lookups for the given servers to finish.
|
||||||
|
|
Loading…
Reference in a new issue