From 2d76ca3fbebf72157bb0c93c623ea7a3d724c9fb Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 3 Nov 2023 20:35:48 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- powerwall.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/defaults.inc b/defaults.inc index b0db6d5f..62ccc417 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.3.145-11032023' +VERS='2.3.147-11032023' noheader=' update service dailytemp ' diff --git a/powerwall.sh b/powerwall.sh index a0422db0..08951d11 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -793,12 +793,12 @@ Shutting down all servers" 1 OFFSITE_LOAD=$(snmpwalk -v 1 -c public 10.2.1.100 iso.3.6.1.4.1.3808.1.1.1.4.2.3.0 | sed 's/.*: //') if (( $(bc <<<"${OFFSITE_VOLTIN} >= ${min_acvolt}") )); then - if [ -f ${PW_TMPFOLDER}/power.ac.offsite.low ]; then + if [ -f ${PW_TMPFOLDER}/power.offsite.ac.low ]; then echo "(${datetime}) - ${OFFSITE_VOLTIN}'V - Offsite Back to Normal Voltage" >> ${PW_LOGPOWER} echo "(${datetime}) - ${OFFSITE_VOLTIN}'V - OFFSITE POWER NOMINAL AGAIN" >> ${PW_LOGFILE} SENDNOTICE "OFFSITE POWER NOMINAL AGAIN" "(${datetime}) Normal voltage detected VOLTAGE: ${OFFSITE_VOLTIN}'V" - rm -f ${PW_TMPFOLDER}/power.ac.offsite.low + rm -f ${PW_TMPFOLDER}/power.offsite.ac.low else errtime=$(expr `date +%s` - $(stat -c %Y ${PW_LOGPOWER})) [ ${errtime} -le 300 ] && echo "(${datetime}) - ${OFFSITE_VOLTIN}'V - Offsite Normal Voltage" >> ${PW_LOGPOWER} @@ -807,11 +807,11 @@ VOLTAGE: ${OFFSITE_VOLTIN}'V" echo "(${datetime}) - ${OFFSITE_VOLTIN}'V - OFFSITE POWER OFF/LOW POWER" >> ${PW_LOGPOWER} echo "(${datetime}) - ${OFFSITE_VOLTIN}'V - OFFSITE POWER OFF/LOW POWER" >> ${PW_LOGFILE} - errtime=$(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.ac.offsite.low)) - if [ ! -f ${PW_TMPFOLDER}/power.ac.offsite.low ] || [ ${errtime} -ge 300 ]; then + errtime=$(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.offsite.ac.low)) + if [ ! -f ${PW_TMPFOLDER}/power.offsite.ac.low ] || [ ${errtime} -ge 300 ]; then SENDNOTICE "OFFSITE POWER ALERT - POWER OFF/LOW!!" "(${datetime}) Power off or low voltage detected VOLTAGE: ${OFFSITE_VOLTIN}'V" 1 - touch ${PW_TMPFOLDER}/power.ac.offsite.low + touch ${PW_TMPFOLDER}/power.offsite.ac.low fi fi