various fixes

[distro-setup] / system-status

diff --git a/system-status b/system-status
index f39f03176fdae290843d45ea851641ade5b21056..c92bc9a9656583b253d5619f8d97b9ddeffe6260 100755 (executable)
--- a/system-status
+++ b/system-status
@@ -6,15 +6,13 @@
 
 if [ -z "$BASH_VERSION" ]; then echo "error: shell is not bash" >&2; exit 1; fi
 
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
-
+source /a/bin/errhandle/err
 status_file=/dev/shm/iank-status
 
 shopt -s nullglob
 shopt -s dotglob
 
-lo() { /usr/local/bin/log-once -1 "$@"; }
+lo() { /usr/local/bin/log-once "$@"; }
 
 write-status() {
   chars=()
@@ -26,7 +24,7 @@ write-status() {
   glob=(/m/md/bounces/new/*)
   if [[ -e $glob ]]; then
     chars+=("BOUNCE!")
-    lo bounce "message in /m/md/bounces/new"
+    lo -1 bounce "message in /m/md/bounces/new"
   fi
   glob=(/m/md/alerts/new/* /m/md/alerts/cur/*)
   if [[ -e $glob ]]; then
@@ -34,17 +32,17 @@ write-status() {
   fi
   if [[ -e /nocow/user/mailtest-failure ]]; then
     chars+=("MAILPING!")
-    lo mailping "mailtest-check didnt see mail from send-test-forward"
   fi
   if [[ -s /var/log/exim4/paniclog ]]; then
     chars+=("PANIC!")
-    tail /var/log/exim4/paniclog | lo paniclog
+    tail /var/log/exim4/paniclog | lo -1 paniclog
   fi
 
   source /a/bin/bash_unpublished/source-state
   if [[ $MAIL_HOST == $HOSTNAME ]]; then
     if [[ $(systemctl is-active btrbk.timer) != active ]]; then
-      chars+=("BTRBK-TIMER!")
+      chars+=("BTRBK.TIMER!")
+      lo -60 btrbk.timer "btrbk.timer not enabled"
     fi
 
     ## check if last snapshot was within an hour
@@ -61,6 +59,7 @@ write-status() {
     done
     if (( maxtime < now - 60*60 )); then
       chars+=("OLD-SNAPSHOT!")
+      lo -1 old-snapshot "/o snapshot older than 1 hour"
     fi
   fi