diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-05-09 19:02:32 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-05-09 19:04:56 +0100 |
| commit | aedaba018f97202ee69b8715b34d6fc1bac39566 (patch) | |
| tree | ed6354b8096c3a9c8eb36b884c1837b25389a8ef /synapse/handlers | |
| parent | Do some logging when one-time-keys get claimed (diff) | |
| download | synapse-aedaba018f97202ee69b8715b34d6fc1bac39566.tar.xz | |
Replace some instances of preserve_context_over_deferred
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/e2e_keys.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py index 73921a5307..668a90e495 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py @@ -21,7 +21,7 @@ from twisted.internet import defer from synapse.api.errors import SynapseError, CodeMessageException from synapse.types import get_domain_from_id -from synapse.util.logcontext import preserve_fn, preserve_context_over_deferred +from synapse.util.logcontext import preserve_fn, make_deferred_yieldable from synapse.util.retryutils import NotRetryingDestination logger = logging.getLogger(__name__) @@ -145,7 +145,7 @@ class E2eKeysHandler(object): "status": 503, "message": e.message } - yield preserve_context_over_deferred(defer.gatherResults([ + yield make_deferred_yieldable(defer.gatherResults([ preserve_fn(do_remote_query)(destination) for destination in remote_queries_not_in_cache ])) @@ -257,7 +257,7 @@ class E2eKeysHandler(object): "status": 503, "message": e.message } - yield preserve_context_over_deferred(defer.gatherResults([ + yield make_deferred_yieldable(defer.gatherResults([ preserve_fn(claim_client_keys)(destination) for destination in remote_queries ])) |