Bind Mail effects to stable delivery attempts

This commit is contained in:
2026-08-03 05:00:30 +02:00
parent 50ce8b0acb
commit 5df26be074
3 changed files with 26 additions and 1 deletions
@@ -2321,6 +2321,11 @@ def _perform_single_message_direct_effect(
),
smtp_server_id=delivery_context.snapshot.smtp_server_id,
smtp_credential_id=delivery_context.snapshot.smtp_credential_id,
recovery_effect_id=(
f"campaign-single:{action.id}:smtp-attempt:{attempt.attempt_number}"
),
recovery_resource_type="campaign_message_action",
recovery_resource_id=action.id,
)
except SmtpSendError as exc:
if exc.outcome_unknown:
@@ -3633,6 +3638,11 @@ def _send_claimed_mail_only_job(
or "",
smtp_server_id=context.snapshot.smtp_server_id,
smtp_credential_id=context.snapshot.smtp_credential_id,
recovery_effect_id=(
f"campaign-job:{job.id}:smtp-attempt:{attempt.attempt_number}"
),
recovery_resource_type="campaign_job",
recovery_resource_id=job.id,
)
if result.accepted_count <= 0:
raise SmtpSendError(
@@ -4780,6 +4790,11 @@ def _invoke_imap_append(
smtp_credential_id=snapshot.smtp_credential_id,
imap_server_id=snapshot.imap_server_id,
imap_credential_id=snapshot.imap_credential_id,
recovery_effect_id=(
f"campaign-job:{job.id}:imap-attempt:{claimed.attempt.attempt_number}"
),
recovery_resource_type="campaign_job",
recovery_resource_id=job.id,
)