cron: rewrite ansible-daily-run script (one trap only)

jboss-set · Apr 12, 2024 · 3362071 · 3362071
1 parent 56fa9be
commit 3362071
Showing 1 changed file with 7 additions and 7 deletions.
diff --git 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}"