diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-18 14:43:44 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-18 14:43:44 +0100 |
| commit | 1469141023fb01b99e1d1bbb699a4dee803149aa (patch) | |
| tree | f6a3afbafa8a1cb8267a754a5f6e4105c34838d4 /synapse/storage/stream.py | |
| parent | Remove accidentally added file (diff) | |
| parent | Typo (diff) | |
| download | synapse-1469141023fb01b99e1d1bbb699a4dee803149aa.tar.xz | |
Merge branch 'develop' into auth
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) |