diff options
| author | Erik Johnston <erik@matrix.org> | 2018-01-05 10:54:22 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-01-05 10:54:22 +0000 |
| commit | 18e3a16e8b2303e6b638f679b5b8533e329cbe7a (patch) | |
| tree | 93b4f34678d9521e39d54585d6adc66319514bcd /synapse/handlers/appservice.py | |
| parent | Merge pull request #2737 from Valodim/master (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-18e3a16e8b2303e6b638f679b5b8533e329cbe7a.tar.xz | |
Merge branch 'release-v0.26.0' of github.com:matrix-org/synapse v0.26.0
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)) |