From b397b613484d5977a23170bbee2808cbff862676 Mon Sep 17 00:00:00 2001
From: myve <forge@myve.lan>
Date: Wed, 26 Feb 2025 12:28:06 +0000
Subject: [PATCH] Changed rejected email monitor while statement

---
 build/Dockerfile.alpine                       |  2 +-
 build/run/docker-entrypoint/init.d/50-cron.sh | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/build/Dockerfile.alpine b/build/Dockerfile.alpine
index 5e53905..3b06342 100644
--- a/build/Dockerfile.alpine
+++ b/build/Dockerfile.alpine
@@ -24,7 +24,7 @@ RUN printf '%s\n' 'https://dl-cdn.alpinelinux.org/alpine/latest-stable/main/' \
     && apk update \
     && apk upgrade \
     && apk add --no-cache \
-        bash bash-completion ncurses at rsync \
+        bash bash-completion ncurses at rsync grep \
         nginx \
         mariadb mariadb-client mariadb-server-utils \
         ca-certificates acl \
diff --git a/build/run/docker-entrypoint/init.d/50-cron.sh b/build/run/docker-entrypoint/init.d/50-cron.sh
index f11f226..5c75c28 100755
--- a/build/run/docker-entrypoint/init.d/50-cron.sh
+++ b/build/run/docker-entrypoint/init.d/50-cron.sh
@@ -27,11 +27,8 @@ done &
 # Notify if rejected emails were found
 while true
 do
-	unset reject
-	reject=$(grep "NOQUEUE: reject" /var/log/mail/maillog* | grep -F -v -f /var/log/mail/reject.log)
-	if [ ${reject} ]
-	then
-		echo "${reject}" >>/var/log/mail/reject.log
+		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 $$ ;}'
+		echo "$(grep "NOQUEUE: reject" /var/log/mail/maillog* | grep -F -v -f /var/log/mail/reject.log)" >>/var/log/mail/reject.log
 		cat <<- mail | sendmail reject@${MYVEMAIL_DOMAIN}
 		From: reject@${MYVEMAIL_DOMAIN}
 		To: reject@${MYVEMAIL_DOMAIN}
@@ -39,10 +36,9 @@ do
 
 		$(tail -n 1 /var/log/mail/reject.log)
 		mail
-	fi
-	sleep 30
 done &
 
+
 # # Refresh ssl keys daily
 # # https://www.golinuxcloud.com/renew-self-signed-certificate-openssl/
 # while true