diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-05 16:45:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-05 16:45:56 +0100 |
| commit | 3e1b77efc2fe4ef952a3914e01176ec2f283ca89 (patch) | |
| tree | 270134b419c3d9c3caea0a95660c0af91a0ea550 /synapse/storage/room.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary... (diff) | |
| parent | Add support for using keyword arguments with cached functions (diff) | |
| download | synapse-3e1b77efc2fe4ef952a3914e01176ec2f283ca89.tar.xz | |
Merge branch 'erikj/cached_keyword_args' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'synapse/storage/room.py')
| -rw-r--r-- | synapse/storage/room.py | 5 |
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 = ( |