diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-13 17:27:08 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-13 17:27:08 +0100 |
| commit | d6bcc68ea7471f1b404a4fa122f204d0f17dadf9 (patch) | |
| tree | 2d99393df77ab5fea45468fe6c97fe5bafacd512 /synapse/storage/stream.py | |
| parent | Merge pull request #224 from matrix-org/erikj/reactor_metrics (diff) | |
| parent | Remove pointless map (diff) | |
| download | synapse-d6bcc68ea7471f1b404a4fa122f204d0f17dadf9.tar.xz | |
Merge pull request #219 from matrix-org/erikj/dictionary_cache
Dictionary and list caches
Diffstat (limited to 'synapse/storage/stream.py')
| -rw-r--r-- | synapse/storage/stream.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index af45fc5619..d7fe423f5a 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -36,6 +36,7 @@ what sort order was used: from twisted.internet import defer from ._base import SQLBaseStore +from synapse.util.caches.descriptors import cachedInlineCallbacks from synapse.api.constants import EventTypes from synapse.types import RoomStreamToken from synapse.util.logutils import log_function @@ -299,9 +300,8 @@ class StreamStore(SQLBaseStore): defer.returnValue((events, token)) - @defer.inlineCallbacks - def get_recent_events_for_room(self, room_id, limit, end_token, - with_feedback=False, from_token=None): + @cachedInlineCallbacks(num_args=4) + def get_recent_events_for_room(self, room_id, limit, end_token, from_token=None): # TODO (erikj): Handle compressed feedback end_token = RoomStreamToken.parse_stream_token(end_token) |