From d1b726ab483c56d99d368444631ba2574b231892 Mon Sep 17 00:00:00 2001 From: myve Date: Thu, 27 Feb 2025 20:03:27 +0000 Subject: [PATCH] Moved reject tracker out of function --- .../run/docker-entrypoint/init.d/70-reject.sh | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/build/run/docker-entrypoint/init.d/70-reject.sh b/build/run/docker-entrypoint/init.d/70-reject.sh index 1db780e..a8b5789 100755 --- a/build/run/docker-entrypoint/init.d/70-reject.sh +++ b/build/run/docker-entrypoint/init.d/70-reject.sh @@ -1,20 +1,15 @@ #!/usr/bin/env bash # Notify if rejected emails were found -function monitor-rejects -{ - while true - do - bash -c 'tail -n +0 --pid=$$ -f /var/log/mail/maillog* | grep --line-buffered -F -v -f /var/log/mail/reject.log | { sed "/NOQUEUE: reject/q" && kill $$ ;}' - local reject="$(grep "NOQUEUE: reject" /var/log/mail/maillog* | grep -F -v -f /var/log/mail/reject.log)" - echo ${reject} >>/var/log/mail/reject.log - cat <<- mail | sendmail reject@${MYVEMAIL_DOMAIN} - From: reject@${MYVEMAIL_DOMAIN} - To: reject@${MYVEMAIL_DOMAIN} - Subject: Rejected email found +while true +do + bash -c 'tail -n +0 --pid=$$ -f /var/log/mail/maillog* | grep --line-buffered -F -v -f /var/log/mail/reject.log | { sed "/NOQUEUE: reject/q" && kill $$ ;}' + reject="$(grep "NOQUEUE: reject" /var/log/mail/maillog* | grep -F -v -f /var/log/mail/reject.log)" + echo ${reject} >>/var/log/mail/reject.log + cat <<- mail | sendmail reject@${MYVEMAIL_DOMAIN} + From: reject@${MYVEMAIL_DOMAIN} + To: reject@${MYVEMAIL_DOMAIN} + Subject: Rejected email found - ${reject} - mail - done -} - -monitor-rejects & + ${reject} + mail +done &