From 10741f0e4dcbef8472a1acdcf37d98c88b2dc1f4 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 5 Nov 2023 15:15:20 -0600 Subject: [PATCH] Update offsite-power-check.sh --- offsite-power-check.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/offsite-power-check.sh b/offsite-power-check.sh index f5eb5ad4..ebd921a7 100755 --- a/offsite-power-check.sh +++ b/offsite-power-check.sh @@ -38,7 +38,7 @@ OFFSITE_BATT_RUNTIME=`echo "scale=2; ${OFFSITE_BATT_RUNTIME}/60" | bc` OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //') while true; do - if [ ${OFFSITE_VOLTIN%.*} -gt 105 ]; then + if [ ${OFFSITE_VOLTIN%.*} > 105 ]; then if [ -f ${PW_TMPFOLDER}/power.offsite.ac.low ]; then echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - Offsite Back to Normal Voltage" >> ${PW_LOGPOWER} echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - OFFSITE POWER NOMINAL AGAIN" >> ${PW_LOGFILE} @@ -50,7 +50,7 @@ while true; do if [ ! -f ${PW_TMPFOLDER}/power.offsite.restored ]; then touch ${PW_TMPFOLDER}/power.offsite.restored - elif [ $(expr `date +%s` - $(stat -f %m ${PW_TMPFOLDER}/power.offsite.restored)) -ge 60 ]; then + elif [ $(expr `date +%s` - $(stat -f %m ${PW_TMPFOLDER}/power.offsite.restored)) > 60 ]; then SENDNOTICE2 "OFFSITE HOST POWER" "Powering offsite host(s) back on after power was restored" for offsite_host in "${PW_OFFSITEHOSTS[@]}"; do # HOSTPOWER ${offsite_host} on >/dev/null 2>&1 @@ -59,20 +59,20 @@ while true; do fi else - [ $(expr `date +%s` - $(stat -f %m ${PW_LOGPOWER})) -gt 299 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - Offsite Normal Voltage" >> ${PW_LOGPOWER} + [ $(expr `date +%s` - $(stat -f %m ${PW_LOGPOWER})) > 300 ] && echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - Offsite Normal Voltage" >> ${PW_LOGPOWER} fi else echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - OFFSITE POWER OFF/LOW POWER" >> ${PW_LOGPOWER} echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'Volts - OFFSITE POWER OFF/LOW POWER" >> ${PW_LOGFILE} - if [ ! -f ${PW_TMPFOLDER}/power.offsite.ac.low ] || [ $(expr `date +%s` - $(stat -f %m ${PW_TMPFOLDER}/power.offsite.ac.low)) -ge 240 ]; then + if [ ! -f ${PW_TMPFOLDER}/power.offsite.ac.low ] || [ $(expr `date +%s` - $(stat -f %m ${PW_TMPFOLDER}/power.offsite.ac.low)) > 240 ]; then SENDNOTICE2 "OFFSITE POWER ALERT - POWER OFF/LOW!!" "Power off or low voltage detected BATT CAPACITY: ${OFFSITE_BATT_CAP}'(percent) BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'Mins" 1 touch ${PW_TMPFOLDER}/power.offsite.ac.low fi - if [ ${OFFSITE_BATT_CAP%.*} -lt 95 ] && [ ! -f ${PW_TMPFOLDER}/power.offsite.off ]; then + if [ ${OFFSITE_BATT_CAP%.*} < 95 ] && [ ! -f ${PW_TMPFOLDER}/power.offsite.off ]; then SENDNOTICE2 "OFFSITE HOST POWER" "Powering DOWN offsite host(s) due to power outage" 1 # SHUTDOWN_OFFSITE & touch ${PW_TMPFOLDER}/power.offsite.off