summary refs log tree commit diff
path: root/synapse/storage/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-27 13:57:29 +0100
committerErik Johnston <erik@matrix.org>2015-07-27 13:57:29 +0100
commit39e21ea51cf94f436f1f845f24c1b04f11b92c6f (patch)
treeb9517d390414bf0512c087c58ff061fd42b33b9c /synapse/storage/room.py
parentMerge pull request #205 from matrix-org/erikj/pick_largest_thumbnail (diff)
downloadsynapse-39e21ea51cf94f436f1f845f24c1b04f11b92c6f.tar.xz
Add support for using keyword arguments with cached functions
Diffstat (limited to 'synapse/storage/room.py')
-rw-r--r--synapse/storage/room.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index 4612a8aa83..dd5bc2c8fb 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -17,7 +17,7 @@ from twisted.internet import defer
 
 from synapse.api.errors import StoreError
 
-from ._base import SQLBaseStore, cached
+from ._base import SQLBaseStore, cachedInlineCallbacks
 
 import collections
 import logging
@@ -186,8 +186,7 @@ class RoomStore(SQLBaseStore):
                 }
             )
 
-    @cached()
-    @defer.inlineCallbacks
+    @cachedInlineCallbacks()
     def get_room_name_and_aliases(self, room_id):
         def f(txn):
             sql = (