X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=mailtest-check;fp=mailtest-check;h=036aeff1a2faf981367d7ff69f9ebb98cff26a58;hb=d6def754cd241538c61456536b52ee51cbd85b42;hp=cce5908fb78267d53c06a8bb224df0248b40daca;hpb=f46ee5570766081a5a73ce0d2132c8a06ee966fb;p=distro-setup

diff --git a/mailtest-check b/mailtest-check
index cce5908..036aeff 100755
--- a/mailtest-check
+++ b/mailtest-check
@@ -104,6 +104,7 @@ main() {
           try_left=$(( try_limit - ( EPOCHSECONDS - try_start_time) ))
           timeout=120 # somewhat arbitrary value
           if (( try_left < 0 )); then
+            echo "mailtest-check: failed to rsync fencepost > $try_limit seconds"
             break
           fi
           if (( try_left < timeout )); then
@@ -145,10 +146,11 @@ EOF
   fi
   tmpfile=$(mktemp)
   declare -i unexpected=0
-  declare -i missing_dnswl=0
-  declare -i dnsfail=0
   for folder in ${folders[@]}; do
     for from in ${froms[@]}; do
+      declare -i missing_dnswl=0
+      declare -i dnsfail=0
+      declare -i unexpected=0
       latest=
       last_sec=0
 
@@ -217,8 +219,8 @@ EOF
             # eggs has RCVD_IN_DNSWL_MED
             keys+=(RCVD_IN_DNSWL_MED)
           elif [[ $from == *@gnu.org ]]; then
-            # eggs has these
-            keys+=(RCVD_IN_DNSWL_MED DKIMWL_WL_HIGH)
+            # eggs has this. it used to have DKIMWL_WL_HIGH sometime in 2022
+            keys+=(RCVD_IN_DNSWL_MED)
           fi
 
           for t in  ${keys[@]}; do
@@ -289,6 +291,10 @@ EOF
                 ;;
             esac
           done
+          pr <<EOF
+mailtest_check_missing_dnswl{folder="$folder",from="$from"} $missing_dnswl
+mailtest_check_unexpected_spamd_results{folder="$folder",from="$from"} $unexpected
+EOF
         fi # if spamdpid
       fi # if $slow
 
@@ -302,12 +308,6 @@ mailtest_check_last_usec{folder="$folder",from="$from"} $last_sec
 EOF
     done # end for from in ${froms[@]}
   done # end for folder in ${folders[@]}
-  if $slow; then
-    pr <<EOF
-mailtest_check_missing_dnswl $missing_dnswl
-mailtest_check_unexpected_spamd_results $unexpected
-EOF
-  fi
 
   dir=/var/lib/prometheus/node-exporter
   if [[ -e $dir  ]]; then