summary refs log tree commit diff
path: root/synapse/storage/room.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-08-13 17:23:39 +0100
committerMark Haines <mark.haines@matrix.org>2015-08-13 17:23:39 +0100
commitb16cd18a86a530d955d38bbdbc03daa0d70a2f9b (patch)
tree8a2e6eb451ec5121affe2afc13ce95ab6fcc4bfd /synapse/storage/room.py
parentDoc-string for config ultility function (diff)
parentMerge pull request #224 from matrix-org/erikj/reactor_metrics (diff)
downloadsynapse-b16cd18a86a530d955d38bbdbc03daa0d70a2f9b.tar.xz
Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thumbnails
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 = (