summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-05-19 14:50:55 +0100
committerErik Johnston <erik@matrix.org>2017-05-19 14:50:55 +0100
commitf0ed2e408f70b24aa3a86b180bddb1035e136780 (patch)
treed76b61ff38cdc87792d02dbfa895a083e0fa01a7
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #2236 from matrix-org/erikj/invalidation (diff)
downloadsynapse-f0ed2e408f70b24aa3a86b180bddb1035e136780.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes 2017-05-22_1657
-rw-r--r--synapse/storage/receipts.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/receipts.py b/synapse/storage/receipts.py
index efb90c3c91..f42b8014c7 100644
--- a/synapse/storage/receipts.py
+++ b/synapse/storage/receipts.py
@@ -45,7 +45,9 @@ class ReceiptsStore(SQLBaseStore):
             return
 
         # Returns an ObservableDeferred
-        res = self.get_users_with_read_receipts_in_room.cache.get((room_id,), None)
+        res = self.get_users_with_read_receipts_in_room.cache.get(
+            room_id, None, update_metrics=False,
+        )
 
         if res:
             if isinstance(res, defer.Deferred) and res.called: