Skip to content

smtp_batch: proper exit code when non-interactive #2608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebix merged 1 commit into from
Apr 28, 2025
Merged

smtp_batch: proper exit code when non-interactive #2608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions intelmq/bots/outputs/smtp_batch/output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,12 @@ def cli_run(self):
sys.exit(0)
elif i == "all":
count = 0
exit_code = 0
for mail in mails:
if self.build_mail(mail, send=True):
succ = self.build_mail(mail, send=True)
if not succ:
exit_code = 1
else:
count += 1
print(f"{mail.to} ", end="", flush=True)
try:
Expand All @@ -183,7 +187,7 @@ def cli_run(self):
if mail.path:
os.unlink(mail.path)
print(f"\n{count}× mail sent.\n")
sys.exit(0)
sys.exit(exit_code)
elif i == "clear":
for mail in mails:
self.cache.redis.delete(mail.key)
Expand Down