viktor/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(mailserver): delete all e2e-probe emails, not just current marker

Browse source 
Previously only searched for the current run's specific marker subject.
If IMAP deletion failed, old emails accumulated. Now searches for all
emails with "e2e-probe" in subject and deletes them, cleaning up any
leftovers from prior failed runs.
This commit is contained in:
Viktor Barzin 2026-04-06 13:39:47 +03:00
parent 9349d5d566
commit 25aee1d3e9
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
stacks/mailserver/modules/mailserver/main.tf
View file

@ -610,12 +610,16 @@ try:
if msg_ids[0]: if msg_ids[0]:
found = True found = True
print(f"Found test email after {attempt+1} attempts") print(f"Found test email after {attempt+1} attempts")
# Delete the test email # Delete ALL e2e probe emails (current + any leftovers from previous runs)
if found:
try: try:
for mid in msg_ids[0].split(): _, all_e2e = imap.search(None, "SUBJECT", "e2e-probe")
imap.store(mid, "+FLAGS", "\\Deleted") if all_e2e[0]:
imap.expunge() e2e_ids = all_e2e[0].split()
print("Deleted test email") for mid in e2e_ids:
imap.store(mid, "+FLAGS", "(\\Deleted)")
imap.expunge()
print(f"Deleted {len(e2e_ids)} e2e probe email(s)")
except Exception as de: except Exception as de:
print(f"Delete failed (non-critical): {de}") print(f"Delete failed (non-critical): {de}")
imap.logout() imap.logout()