summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-10 11:09:56 +0000
committerErik Johnston <erik@matrix.org>2016-02-10 11:09:56 +0000
commit02147452396c67e7874b201460f8b1cc8996a90a (patch)
tree11e4f5f8e687d01d4f251fdea7dffff0be430d5c /synapse
parentAtomically persit push actions when we persist the event (diff)
downloadsynapse-02147452396c67e7874b201460f8b1cc8996a90a.tar.xz
Rename functions
Diffstat (limited to '')
-rw-r--r--synapse/storage/event_push_actions.py4
-rw-r--r--synapse/storage/events.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py
index 466f07a1c4..d77a817682 100644
--- a/synapse/storage/event_push_actions.py
+++ b/synapse/storage/event_push_actions.py
@@ -24,7 +24,7 @@ logger = logging.getLogger(__name__)
 
 
 class EventPushActionsStore(SQLBaseStore):
-    def _set_push_actions_for_event_and_users(self, txn, event, tuples):
+    def _set_push_actions_for_event_and_users_txn(self, txn, event, tuples):
         """
         :param event: the event set actions for
         :param tuples: list of tuples of (user_id, profile_tag, actions)
@@ -100,7 +100,7 @@ class EventPushActionsStore(SQLBaseStore):
         )
         defer.returnValue(ret)
 
-    def _remove_push_actions_for_event_id(self, txn, room_id, event_id):
+    def _remove_push_actions_for_event_id_txn(self, txn, room_id, event_id):
         # Sad that we have to blow away the cache for the whole room here
         txn.call_after(
             self.get_unread_event_push_actions_by_room_for_user.invalidate_many,
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 7d4012c414..3a5c6ee4b1 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -221,12 +221,12 @@ class EventsStore(SQLBaseStore):
                 )
 
             if context.push_actions:
-                self._set_push_actions_for_event_and_users(
+                self._set_push_actions_for_event_and_users_txn(
                     txn, event, context.push_actions
                 )
 
         if event.type == EventTypes.Redaction and event.redacts is not None:
-            self._remove_push_actions_for_event_id(
+            self._remove_push_actions_for_event_id_txn(
                 txn, event.room_id, event.redacts
             )