summary refs log tree commit diff
path: root/synapse/storage/receipts.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-04-07 16:35:22 +0100
committerDavid Baker <dave@matrix.org>2016-04-07 16:35:22 +0100
commit9c99ab4572623a8a9554e6c0292f34059252c6b7 (patch)
tree3b231aab16688d64bc6e30561ddd42949c2ab727 /synapse/storage/receipts.py
parentRemove code that's now been obsoleted or moved elsewhere (diff)
parentMerge pull request #703 from matrix-org/erikj/member (diff)
downloadsynapse-9c99ab4572623a8a9554e6c0292f34059252c6b7.tar.xz
Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_actions
Diffstat (limited to 'synapse/storage/receipts.py')
-rw-r--r--synapse/storage/receipts.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/receipts.py b/synapse/storage/receipts.py
index 59d1ac0314..3b8805593e 100644
--- a/synapse/storage/receipts.py
+++ b/synapse/storage/receipts.py
@@ -160,8 +160,8 @@ class ReceiptsStore(SQLBaseStore):
             "content": content,
         }])
 
-    @cachedList(cache=get_linearized_receipts_for_room.cache, list_name="room_ids",
-                num_args=3, inlineCallbacks=True)
+    @cachedList(cached_method_name="get_linearized_receipts_for_room",
+                list_name="room_ids", num_args=3, inlineCallbacks=True)
     def _get_linearized_receipts_for_rooms(self, room_ids, to_key, from_key=None):
         if not room_ids:
             defer.returnValue({})