X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=mailtest-check;h=9b41954f1106476707afbf7e4d5202105faca73f;hb=fa5deaee2e0182ddfc7b39eea7ee2acedb259ddf;hp=befdbbfbe8b8b56b496dd352e4cc804b025c5dfa;hpb=b18dade73dedfe69aa741f8417947d83c4208f2d;p=distro-setup

diff --git a/mailtest-check b/mailtest-check
index befdbbf..9b41954 100755
--- a/mailtest-check
+++ b/mailtest-check
@@ -57,6 +57,8 @@ fi
 #Nov  8 08:16:05.439 [6080] warn: plugin: failed to parse plugin (from @INC): Can't locate Mail/SpamAssassin/Plugin/VBounce.pm: lib/Mail/SpamAssassin/Plugin/VBounce.pm: Permission denied at (eval 60) line 1.
 # i dont know why, i just found the solution online
 cd /m/md
+# TODO, get je to deliver the local mailbox: /m/md/INBOX
+# dovecot appears to setup, i can t be sure.
 
 case $HOSTNAME in
   bk)
@@ -78,7 +80,14 @@ esac
 
 getspamdpid() {
   if [[ ! $spamdpid || ! -d /proc/$spamdpid ]]; then
-    spamdpid=$(systemctl show --property MainPID --value spamassassin | sed 's/^1$//' ||:)
+    # try twice in case we are restarting, it happens.
+    for i in 1 2; do
+      spamdpid=$(systemctl show --property MainPID --value spamassassin | sed 's/^[10]$//' ||:)
+      if [[ $spamdpid ]]; then
+        break
+      fi
+      sleep 30
+    done
   fi
 }
 getspamdpid
@@ -135,7 +144,8 @@ for folder in ${folders[@]}; do
           # servers.
           # example line that sed is parsing:
           # (-0.1 / 5.0 requ) DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,SPF_HELO_PASS=-0.001,SPF_PASS=-0.001,TVD_SPACE_RATIO=0.001 autolearn=_AUTOLEARN
-          for r in $($spamcpre sudo -u Debian-exim spamassassin -t --cf='score PYZOR_CHECK 0' <"$latest" | tail -n2 | head -n1 | sed -r 's/^\([^)]*\) *//;s/=[^, ]*([, ]|$)/ /g'); do
+          raw_results="$($spamcpre sudo -u Debian-exim spamassassin -t --cf='score PYZOR_CHECK 0' <"$latest" | tail -n2 | head -n1 | sed -r 's/^\([^)]*\) *//;s/=[^, ]*([, ]|$)/ /g')"
+          for r in $raw_results; do
             case $r in
               # got this in an update 2022-01. dun care
               T_SCC_BODY_TEXT_LINE|SCC_BODY_SINGLE_WORD) : ;;
@@ -202,7 +212,7 @@ for folder in ${folders[@]}; do
       fi # if $slow
     fi # if [[ $latest ]]
 
-    now=$(date +%s)
+    now=$EPOCHSECONDS
     limit=$(( now - 60 * min_limit ))
     age_sec=$(( now - last_sec ))
     e $((age_sec / 60)):$(( age_sec % 60 )) ago. to:$to from:$from $latest