diff options
| author | David Baker <dave@matrix.org> | 2015-08-20 10:16:01 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-08-20 10:16:01 +0100 |
| commit | c50ad14bae20d2a8448bb9fe78e919958dc9d233 (patch) | |
| tree | 3b6b3221cb11b16a105d1edf9e4ffe9519c3900a /synapse/storage/room.py | |
| parent | Allow sign in using email address (diff) | |
| parent | Merge pull request #211 from matrix-org/email_in_use (diff) | |
| download | synapse-c50ad14bae20d2a8448bb9fe78e919958dc9d233.tar.xz | |
Merge branch 'develop' into email_login
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 4612a8aa83..5e07b7e0e5 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -17,7 +17,8 @@ from twisted.internet import defer from synapse.api.errors import StoreError -from ._base import SQLBaseStore, cached +from ._base import SQLBaseStore +from synapse.util.caches.descriptors import cachedInlineCallbacks import collections import logging @@ -186,8 +187,7 @@ class RoomStore(SQLBaseStore): } ) - @cached() - @defer.inlineCallbacks + @cachedInlineCallbacks() def get_room_name_and_aliases(self, room_id): def f(txn): sql = ( |