summary refs log tree commit diff
path: root/synapse/storage/keys.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-05 16:45:56 +0100
committerErik Johnston <erik@matrix.org>2015-08-05 16:45:56 +0100
commit3e1b77efc2fe4ef952a3914e01176ec2f283ca89 (patch)
tree270134b419c3d9c3caea0a95660c0af91a0ea550 /synapse/storage/keys.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary... (diff)
parentAdd support for using keyword arguments with cached functions (diff)
downloadsynapse-3e1b77efc2fe4ef952a3914e01176ec2f283ca89.tar.xz
Merge branch 'erikj/cached_keyword_args' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'synapse/storage/keys.py')
-rw-r--r--synapse/storage/keys.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py
index 940a5f7e08..e3f98f0cde 100644
--- a/synapse/storage/keys.py
+++ b/synapse/storage/keys.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from _base import SQLBaseStore, cached
+from _base import SQLBaseStore, cachedInlineCallbacks
 
 from twisted.internet import defer
 
@@ -71,8 +71,7 @@ class KeyStore(SQLBaseStore):
             desc="store_server_certificate",
         )
 
-    @cached()
-    @defer.inlineCallbacks
+    @cachedInlineCallbacks()
     def get_all_server_verify_keys(self, server_name):
         rows = yield self._simple_select_list(
             table="server_signature_keys",