diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-03 09:54:08 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-03 09:54:08 +0100 |
| commit | efeeff29f66f14fd4744413a3fd211d01e6c302a (patch) | |
| tree | db5be4d096fdd045623017abffc7b67806c55c32 /synapse/storage/room.py | |
| parent | hacky support for video for FS CC DD (diff) | |
| parent | Change log level to info (diff) | |
| download | synapse-efeeff29f66f14fd4744413a3fd211d01e6c302a.tar.xz | |
Merge branch 'release-v0.10.0' v0.10.0
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 = ( |