Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-24 11:09:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that we delete staging push actions on errors

Browse Source
This commit is contained in:
Erik Johnston 2018-02-15 15:37:40 +00:00
parent 4810f7effd
commit b96278d6fe
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/handlers/message.py
View File

@ -683,9 +683,15 @@ class EventCreationHandler(object):
event, context event, context
) )
(event_stream_id, max_stream_id) = yield self.store.persist_event( try:
event, context=context (event_stream_id, max_stream_id) = yield self.store.persist_event(
) event, context=context
)
except: # noqa: E722, as we reraise the exception this is fine.
# Ensure that we actually remove the entries in the push actions
# staging area
preserve_fn(self.store.remove_push_actions_from_staging)(event.event_id)
raise
# this intentionally does not yield: we don't care about the result # this intentionally does not yield: we don't care about the result
# and don't need to wait for it. # and don't need to wait for it.

16
synapse/storage/event_push_actions.py
View File

@ -782,6 +782,22 @@ class EventPushActionsStore(SQLBaseStore):
desc="add_push_actions_to_staging", desc="add_push_actions_to_staging",
) )
def remove_push_actions_from_staging(self, event_id):
"""Called if we failed to persist the event to ensure that stale push
actions don't build up in the DB
Args:
event_id (str)
"""
return self._simple_delete(
table="event_push_actions_staging",
keyvalues={
"event_id": event_id,
},
desc="remove_push_actions_from_staging",
)
def _action_has_highlight(actions): def _action_has_highlight(actions):
for action in actions: for action in actions: