diff options
author | Erik Johnston <erik@matrix.org> | 2018-04-27 13:09:25 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-04-27 13:09:25 +0100 |
commit | 2422eaf5800ef3fb668fae055bd0ce5378590a7d (patch) | |
tree | 009b391f594c1b23cb2b267d6cd77a40c32b0be7 /synapse/appservice/api.py | |
parent | 6cd1cb036e45c300c0231947cbc488d4816e7968 (diff) |
New upstream version 0.28.0
Diffstat (limited to 'synapse/appservice/api.py')
-rw-r--r-- | synapse/appservice/api.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py index 40c433d7..00efff14 100644 --- a/synapse/appservice/api.py +++ b/synapse/appservice/api.py @@ -18,7 +18,6 @@ from synapse.api.constants import ThirdPartyEntityKind from synapse.api.errors import CodeMessageException from synapse.http.client import SimpleHttpClient from synapse.events.utils import serialize_event -from synapse.util.logcontext import preserve_fn, make_deferred_yieldable from synapse.util.caches.response_cache import ResponseCache from synapse.types import ThirdPartyInstanceID @@ -73,7 +72,8 @@ class ApplicationServiceApi(SimpleHttpClient): super(ApplicationServiceApi, self).__init__(hs) self.clock = hs.get_clock() - self.protocol_meta_cache = ResponseCache(hs, timeout_ms=HOUR_IN_MS) + self.protocol_meta_cache = ResponseCache(hs, "as_protocol_meta", + timeout_ms=HOUR_IN_MS) @defer.inlineCallbacks def query_user(self, service, user_id): @@ -193,12 +193,7 @@ class ApplicationServiceApi(SimpleHttpClient): defer.returnValue(None) key = (service.id, protocol) - result = self.protocol_meta_cache.get(key) - if not result: - result = self.protocol_meta_cache.set( - key, preserve_fn(_get)() - ) - return make_deferred_yieldable(result) + return self.protocol_meta_cache.wrap(key, _get) @defer.inlineCallbacks def push_bulk(self, service, events, txn_id=None): |