diff options
author | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
commit | d8a6c734fa1ab6681431c43885ced627e5e672e0 (patch) | |
tree | 4ba6a510997e38e829c6a6b0aa53caace4e7b872 /synapse/handlers/appservice.py | |
parent | Copy dict in update_membership too (diff) | |
parent | Merge pull request #2723 from matrix-org/matthew/search-all-local-users (diff) | |
download | synapse-d8a6c734fa1ab6681431c43885ced627e5e672e0.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom_content
Diffstat (limited to 'synapse/handlers/appservice.py')
-rw-r--r-- | synapse/handlers/appservice.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py index 543bf28aec..feca3e4c10 100644 --- a/synapse/handlers/appservice.py +++ b/synapse/handlers/appservice.py @@ -17,7 +17,7 @@ from twisted.internet import defer from synapse.api.constants import EventTypes from synapse.util.metrics import Measure -from synapse.util.logcontext import preserve_fn, preserve_context_over_deferred +from synapse.util.logcontext import make_deferred_yieldable, preserve_fn import logging @@ -159,7 +159,7 @@ class ApplicationServicesHandler(object): def query_3pe(self, kind, protocol, fields): services = yield self._get_services_for_3pn(protocol) - results = yield preserve_context_over_deferred(defer.DeferredList([ + results = yield make_deferred_yieldable(defer.DeferredList([ preserve_fn(self.appservice_api.query_3pe)(service, kind, protocol, fields) for service in services ], consumeErrors=True)) |