summary refs log tree commit diff
path: root/synapse/storage/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-06 13:52:49 +0100
committerErik Johnston <erik@matrix.org>2015-08-06 13:52:49 +0100
commit8049c9a71e3c6187a600e41969d99537c63fad67 (patch)
tree6d4dbf2656816e1506f16c272fd4d8c5357fea2e /synapse/storage/room.py
parentUp the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room' (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/cached_key... (diff)
downloadsynapse-8049c9a71e3c6187a600e41969d99537c63fad67.tar.xz
Merge pull request #209 from matrix-org/erikj/cached_keyword_args
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 = (