From 3362071e3a8cd9acb92a58c439a583e738678ac1 Mon Sep 17 00:00:00 2001
From: Romain Pelisse <belaran@gmail.com>
Date: Fri, 12 Apr 2024 17:13:39 +0200
Subject: [PATCH] cron: rewrite ansible-daily-run script (one trap only)

---
 roles/cron/templates/ansible-daily-run.sh.j2 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/cron/templates/ansible-daily-run.sh.j2 b/roles/cron/templates/ansible-daily-run.sh.j2
index c07b2ce..ff18de4 100644
--- a/roles/cron/templates/ansible-daily-run.sh.j2
+++ b/roles/cron/templates/ansible-daily-run.sh.j2
@@ -20,11 +20,12 @@ zeus_status() {
   fi
 }
 
-mail_report() {
-    local subject=$(head -1 "${LOGFILE}" | sed -e "s;$; (Status: $(zeus_status));")
-    cat "${LOGFILE}" | \
-        mailx -r "{{ mailer.to }}" -s "{{ jobs.name }}:${subject}" \
-        -S smtp="{{ mailer.smtp.host }}:{{mailer.smtp.port }}" "{{ mailer.replyTo }}"
+mail_report_and_clean() {
+  local subject=$(head -1 "${LOGFILE}" | sed -e "s;$; (Status: $(zeus_status));")
+  cat "${LOGFILE}" | \
+      mailx -r "{{ mailer.to }}" -s "{{ jobs.name }}:${subject}" \
+      -S smtp="{{ mailer.smtp.host }}:{{mailer.smtp.port }}" "{{ mailer.replyTo }}"
+  rm -f "${LOGFILE}"
 }
 
 run_zeus() {
@@ -36,7 +37,6 @@ run_zeus() {
   echo "${?}" > "${ZEUS_STATUS_FILE}"
 }
 
-trap mail_report EXIT
-trap "rm -f ${LOGFILE}" EXIT
+trap mail_report_and_clean EXIT
 
 run_zeus >> "${LOGFILE}"