Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes

2017-05-19 14:50:55 +01:00 · 2017-05-19 14:50:55 +01:00 · f0ed2e408f
parent 3da426357c ab4ee2e524
commit f0ed2e408f
1 changed files with 3 additions and 1 deletions
--- 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: