diff options
author | Erik Johnston <erikj@jki.re> | 2018-02-21 11:00:06 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-21 11:00:06 +0000 |
commit | 27939cbb0e129ea791151cfddc87c641138b09ba (patch) | |
tree | bbe10843447f323a871435cf034995b67b28ced0 | |
parent | Merge pull request #2896 from matrix-org/erikj/split_receipts_store (diff) | |
parent | Delete from push_actions_staging in federation too (diff) | |
download | synapse-27939cbb0e129ea791151cfddc87c641138b09ba.tar.xz |
Merge pull request #2893 from matrix-org/erikj/delete_from_staging_fed
Delete from push_actions_staging in federation too
Diffstat (limited to '')
-rw-r--r-- | synapse/handlers/federation.py | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 46bcf8b081..8832ba58bc 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1447,16 +1447,24 @@ class FederationHandler(BaseHandler): auth_events=auth_events, ) - if not event.internal_metadata.is_outlier() and not backfilled: - yield self.action_generator.handle_push_actions_for_event( - event, context - ) + try: + if not event.internal_metadata.is_outlier() and not backfilled: + yield self.action_generator.handle_push_actions_for_event( + event, context + ) - event_stream_id, max_stream_id = yield self.store.persist_event( - event, - context=context, - backfilled=backfilled, - ) + event_stream_id, max_stream_id = yield self.store.persist_event( + event, + context=context, + backfilled=backfilled, + ) + except: # noqa: E722, as we reraise the exception this is fine. + # Ensure that we actually remove the entries in the push actions + # staging area + logcontext.preserve_fn( + self.store.remove_push_actions_from_staging + )(event.event_id) + raise if not backfilled: # this intentionally does not yield: we don't care about the result |