summary refs log tree commit diff
path: root/synapse/replication/slave
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-06-24 11:41:11 +0100
committerDavid Baker <dave@matrix.org>2016-06-24 11:41:11 +0100
commit870c45913ef17584a65d0acf98336f1ddd6bf1c0 (patch)
tree2081f0da923a22df61fa561bb36ac30d44c68828 /synapse/replication/slave
parentMerge branch 'master' into develop (diff)
downloadsynapse-870c45913ef17584a65d0acf98336f1ddd6bf1c0.tar.xz
Use similar naming we use in email notifs for push
Fixes https://github.com/vector-im/vector-web/issues/1654
Diffstat (limited to 'synapse/replication/slave')
-rw-r--r--synapse/replication/slave/storage/events.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py
index 877c68508c..86e0721ace 100644
--- a/synapse/replication/slave/storage/events.py
+++ b/synapse/replication/slave/storage/events.py
@@ -64,7 +64,6 @@ class SlavedEventStore(BaseSlavedStore):
 
     # Cached functions can't be accessed through a class instance so we need
     # to reach inside the __dict__ to extract them.
-    get_room_name_and_aliases = RoomStore.__dict__["get_room_name_and_aliases"]
     get_rooms_for_user = RoomMemberStore.__dict__["get_rooms_for_user"]
     get_users_in_room = RoomMemberStore.__dict__["get_users_in_room"]
     get_latest_event_ids_in_room = EventFederationStore.__dict__[
@@ -202,7 +201,6 @@ class SlavedEventStore(BaseSlavedStore):
             self.get_rooms_for_user.invalidate_all()
             self.get_users_in_room.invalidate((event.room_id,))
             # self.get_joined_hosts_for_room.invalidate((event.room_id,))
-            self.get_room_name_and_aliases.invalidate((event.room_id,))
 
         self._invalidate_get_event_cache(event.event_id)
 
@@ -246,9 +244,3 @@ class SlavedEventStore(BaseSlavedStore):
         self._get_current_state_for_key.invalidate((
             event.room_id, event.type, event.state_key
         ))
-
-        if event.type in [EventTypes.Name, EventTypes.Aliases]:
-            self.get_room_name_and_aliases.invalidate(
-                (event.room_id,)
-            )
-            pass