summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-03-24 13:57:45 +0000
committerGitHub <noreply@github.com>2017-03-24 13:57:45 +0000
commit281553afe6a46e438679b503d93f67fe8f2e259e (patch)
tree7b9f36c0eef99ad88f011833ba4d4ebd5bb7529b
parentMerge pull request #2061 from matrix-org/erikj/add_transaction_store (diff)
parentActually call invalidate (diff)
downloadsynapse-281553afe6a46e438679b503d93f67fe8f2e259e.tar.xz
Merge pull request #2062 from matrix-org/erikj/presence_replication
Use presence replication stream to invalidate cache
-rw-r--r--synapse/replication/slave/storage/presence.py1
-rw-r--r--synapse/storage/presence.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/replication/slave/storage/presence.py b/synapse/replication/slave/storage/presence.py
index 40f6c9a386..e4a2414d78 100644
--- a/synapse/replication/slave/storage/presence.py
+++ b/synapse/replication/slave/storage/presence.py
@@ -57,5 +57,6 @@ class SlavedPresenceStore(BaseSlavedStore):
                 self.presence_stream_cache.entity_has_changed(
                     user_id, position
                 )
+                self._get_presence_for_user.invalidate((user_id,))
 
         return super(SlavedPresenceStore, self).process_replication(result)
diff --git a/synapse/storage/presence.py b/synapse/storage/presence.py
index 4d1590d2b4..9e9d3c2591 100644
--- a/synapse/storage/presence.py
+++ b/synapse/storage/presence.py
@@ -85,8 +85,8 @@ class PresenceStore(SQLBaseStore):
                 self.presence_stream_cache.entity_has_changed,
                 state.user_id, stream_id,
             )
-            self._invalidate_cache_and_stream(
-                txn, self._get_presence_for_user, (state.user_id,)
+            txn.call_after(
+                self._get_presence_for_user.invalidate, (state.user_id,)
             )
 
         # Actually insert new rows