From d050c4c014c992cc405852237bd3f8a574b8ca64 Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Sat, 12 Dec 2020 17:28:49 -0500
Subject: [PATCH] mostly alert fix

---
 brc2           |  5 +++++
 mailtest-check | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/brc2 b/brc2
index 83b4828..37b2ee8 100644
--- a/brc2
+++ b/brc2
@@ -1307,6 +1307,11 @@ enn() {
   m s nsenter -t $pid -n -m $ecmd "$@"
 }
 
+sdnbash() { # systemd namespace bash
+  local unit=$1
+  m sudo nsenter -t $(systemctl status $unit | sed -n '/^ *Main PID:/s/[^0-9]//gp') -n -m sudo -u $USER -i bash
+}
+
 mailnnbash() {
   m sudo nsenter -t $(systemctl status mailnn| sed -n '/^ *Main PID:/s/[^0-9]//gp') -n -m sudo -u $USER -i bash
 }
diff --git a/mailtest-check b/mailtest-check
index 56fdbb2..5a58e07 100755
--- a/mailtest-check
+++ b/mailtest-check
@@ -49,6 +49,11 @@ case $HOSTNAME in
 esac
 
 
+spamdpid=$(systemctl status spamassassin| sed -n '/^ *Main PID:/s/[^0-9]//gp')
+e spamdpid: $spamdpid
+if [[ ! $spamdpid ]]; then
+  echo $HOSTNAME mailtest spamd pid not found
+fi
 for folder in ${folders[@]}; do
   for from in ${froms[@]}; do
     latest=
@@ -67,12 +72,9 @@ for folder in ${folders[@]}; do
 
       if $slow; then
         find $folder/new $folder/cur -type f -mmin +1080 -delete
-        if [[ ! $nspid ]]; then
-          nspid=$(systemctl status mailnn| sed -n '/^ *Main PID:/s/[^0-9]//gp')
-        fi
-        if [[ $nspid ]]; then
-          if [[ $(readlink /proc/$$/ns/net) != "$(readlink /proc/$nspid/ns/net)" ]]; then
-            spamcpre="nsenter -t $nspid -n -m"
+        if [[ $spamdpid ]]; then
+          if [[ $(readlink /proc/$$/ns/net) != "$(readlink /proc/$spamdpid/ns/net)" ]]; then
+            spamcpre="nsenter -t $spamdpid -n -m"
           fi
 
           declare -A results
@@ -122,9 +124,7 @@ for folder in ${folders[@]}; do
             cat $folder/$latest
             echo mailtest-check: end of cat
           fi
-        else
-          echo $HOSTNAME mailtest spamd pid not found
-        fi
+        fi # if spamdpid
       fi # if $slow
     fi # if [[ $latest ]]
 
-- 
2.30.2