various fixes

[distro-setup] / mailtest-check

diff --git a/mailtest-check b/mailtest-check
index 89ed00c1cd54e10f51e31d4c784ab2f7e2e78f6f..67cca9ca84c9e347289306646f05c1aedb8601c8 100755 (executable)
--- a/mailtest-check
+++ b/mailtest-check
@@ -120,6 +120,7 @@ EOF
   fi
   tmpfile=$(mktemp)
   declare -i unexpected=0
+  declare -i missing_dnswl=0
   for folder in ${folders[@]}; do
     for from in ${froms[@]}; do
       latest=
@@ -221,7 +222,6 @@ EOF
             echo # ends our printf string buildup
             cat $resultfile
             echo mailtest-check: end of spam debug results
-
             # lets just handle 1 failure at a time in interactive mode.
             if $int; then
               echo mailtest-check: from: $from, to: $to
@@ -237,7 +237,19 @@ EOF
             #fi
           fi
           rm -f $resultfile
-          unexpected=$(( unexpected + ${#results[@]} + ${#missing[@]} ))
+          unexpected=$(( unexpected + ${#results[@]} ))
+          for miss in ${missing[@]}; do
+            # We expect dns reputation services to go down from time to time, so
+            # we count them separately and alert differently.
+            case $miss in
+              RCVD_IN_DNSWL_MED|DKIMWL_WL_HIGH)
+                missing_dnswl+=1
+                ;;
+              *)
+                unexpected+=1
+                ;;
+            esac
+          done
         fi # if spamdpid
       fi # if $slow
 
@@ -253,6 +265,7 @@ EOF
   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