summary refs log tree commit diff
path: root/synapse/storage/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-21 17:16:10 +0100
committerErik Johnston <erik@matrix.org>2015-05-21 17:16:10 +0100
commit51f5d36f4fcb9b5bd3b1afbf2dcb9d823f2cf84a (patch)
treea44a6260e7b7f5622785d615a46184e19d21d2ca /synapse/storage/room.py
parentMerge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse (diff)
parentBump version (diff)
downloadsynapse-51f5d36f4fcb9b5bd3b1afbf2dcb9d823f2cf84a.tar.xz
Merge branch 'hotfixes-v0.9.0-r5' of github.com:matrix-org/synapse
Diffstat (limited to 'synapse/storage/room.py')
-rw-r--r--synapse/storage/room.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index f956377632..4612a8aa83 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
+from ._base import SQLBaseStore, cached
 
 import collections
 import logging
@@ -186,6 +186,7 @@ class RoomStore(SQLBaseStore):
                 }
             )
 
+    @cached()
     @defer.inlineCallbacks
     def get_room_name_and_aliases(self, room_id):
         def f(txn):