diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-22 10:33:00 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-22 10:33:00 +0100 |
| commit | 4429e720ae2abb64a8bb58a6b8fa9b01c53429a3 (patch) | |
| tree | a4ff9a599d7840541949e5fcc5f74ac26b0695e3 /synapse/storage/room.py | |
| parent | Oops, get_rooms_for_user returns a namedtuple, not a room_id (diff) | |
| parent | Changelog (diff) | |
| download | synapse-4429e720ae2abb64a8bb58a6b8fa9b01c53429a3.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 3 |
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): |