diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-04-21 16:39:04 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-04-21 16:39:04 +0100 |
| commit | b15266fe06d3bfe7b40f55c128bd4ae250ee087b (patch) | |
| tree | 84feb0ec411b40ac5844c4f144d163732c6f6914 /synapse | |
| parent | pip install new python dependencies in jenkins.sh (diff) | |
| parent | Merge branch 'develop' into markjh/slave_event_push_actions (diff) | |
| download | synapse-b15266fe06d3bfe7b40f55c128bd4ae250ee087b.tar.xz | |
Merge pull request #742 from matrix-org/markjh/slave_event_push_actions
Replicate push actions
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/replication/slave/storage/events.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py index 82f171c257..5f37ba6995 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py @@ -21,6 +21,7 @@ from synapse.storage import DataStore from synapse.storage.room import RoomStore from synapse.storage.roommember import RoomMemberStore from synapse.storage.event_federation import EventFederationStore +from synapse.storage.event_push_actions import EventPushActionsStore from synapse.storage.state import StateStore from synapse.util.caches.stream_change_cache import StreamChangeCache @@ -71,7 +72,16 @@ class SlavedEventStore(BaseSlavedStore): get_invited_rooms_for_user = RoomMemberStore.__dict__[ "get_invited_rooms_for_user" ] + get_unread_event_push_actions_by_room_for_user = ( + EventPushActionsStore.__dict__["get_unread_event_push_actions_by_room_for_user"] + ) + get_unread_push_actions_for_user_in_range = ( + DataStore.get_unread_push_actions_for_user_in_range.__func__ + ) + get_push_action_users_in_range = ( + DataStore.get_push_action_users_in_range.__func__ + ) get_event = DataStore.get_event.__func__ get_current_state = DataStore.get_current_state.__func__ get_current_state_for_key = DataStore.get_current_state_for_key.__func__ @@ -167,6 +177,10 @@ class SlavedEventStore(BaseSlavedStore): self.get_latest_event_ids_in_room.invalidate((event.room_id,)) + self.get_unread_event_push_actions_by_room_for_user.invalidate_many( + (event.room_id,) + ) + if not backfilled: self._events_stream_cache.entity_has_changed( event.room_id, event.internal_metadata.stream_ordering |