Delete from push_actions_staging in federation too
This commit is contained in:
parent
3fc33bae8b
commit
d874d4f2d7
1 changed files with 17 additions and 9 deletions
|
@ -1447,16 +1447,24 @@ class FederationHandler(BaseHandler):
|
||||||
auth_events=auth_events,
|
auth_events=auth_events,
|
||||||
)
|
)
|
||||||
|
|
||||||
if not event.internal_metadata.is_outlier() and not backfilled:
|
try:
|
||||||
yield self.action_generator.handle_push_actions_for_event(
|
if not event.internal_metadata.is_outlier() and not backfilled:
|
||||||
event, context
|
yield self.action_generator.handle_push_actions_for_event(
|
||||||
)
|
event, context
|
||||||
|
)
|
||||||
|
|
||||||
event_stream_id, max_stream_id = yield self.store.persist_event(
|
event_stream_id, max_stream_id = yield self.store.persist_event(
|
||||||
event,
|
event,
|
||||||
context=context,
|
context=context,
|
||||||
backfilled=backfilled,
|
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:
|
if not backfilled:
|
||||||
# this intentionally does not yield: we don't care about the result
|
# this intentionally does not yield: we don't care about the result
|
||||||
|
|
Loading…
Reference in a new issue