diff --git a/defaults.inc b/defaults.inc index c931695c..a1bebe0f 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='1.102-05122023' +VERS='1.108-05122023' noupdate=' stop start _service ' diff --git a/powerwall.sh b/powerwall.sh index eaf62af9..55c866cf 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -151,10 +151,10 @@ CHECKACV_SERVICE(){ battstatus=0 else errtime=$(expr `date +%s` - $(stat -c %Y ${logacv})) - [ $errtime -ge 3600 ] && echo "($datetime) - ${INPUTACV}V - Normal Voltage: ${INPUTACV}V" >> ${logacv} + [ $errtime -ge 3600 ] && echo "($datetime) - ${INPUTACV}V - Normal Voltage" >> ${logacv} if [ $voltstatus -eq 0 ]; then echo -e "($datetime) Service Startup\nNormal voltage detected\nVOLTAGE: ${INPUTACV}V" | mail -s "Power Nominal" $email_alert - echo "($datetime) - ${INPUTACV}V - Service Startup - Normal voltage detected VOLTAGE" >> ${logacv} + echo "($datetime) - ${INPUTACV}V - Service Startup - Normal voltage detected" >> ${logacv} fi fi voltstatus=1 @@ -167,18 +167,18 @@ CHECKACV_SERVICE(){ fi voltstatus=3 if [ ${BATTVOLT%.*} -lt ${min_battvolt} ] && [ ${BATTVOLT%.*} -gt ${min_battvolt_sys} ]; then - echo "($datetime) - ${INPUTACV}V - LOW BATTERY voltage" >> ${logacv} + echo "($datetime) - ${BATTVOLT}V - LOW BATTERY Voltage" >> ${logacv} if [ $battstatus -lt 2 ]; then - echo "($datetime) - ${INPUTACV}V - Shutting down main servers..." >> ${logacv} + echo "($datetime) - ${BATTVOLT}V - Shutting down main servers..." >> ${logacv} echo -e "($datetime) Battery Voltage LOW: ${BATTVOLT}V\nShutting down main servers" | mail -s "BATT-VOLT LOW: SHUTDOWN SERVERS" $email_alert # SHUTDOWN_SERVERS MAIN battstatus=2 fi elif [ ${BATTVOLT%.*} -le ${min_battvolt_sys} ]; then - echo "($datetime) SYSTEM LOW BATTERY voltage: ${BATTVOLT}V" >> ${logacv} + echo "($datetime) - ${BATTVOLT}V - LOW BATTERY Voltage" >> ${logacv} if [ $battstatus -lt 3 ]; then - echo "($datetime) - ${INPUTACV}V - Shutting down all remaining servers..." >> ${logacv} + echo "($datetime) - ${BATTVOLT}V - Shutting down all remaining servers..." >> ${logacv} echo -e "($datetime) Battery Voltage REALLY LOW: ${BATTVOLT}V\nShutting down all servers" | mail -s "BATT-VOLT REALLY LOW: SHUTDOWN SERVERS" $email_alert # SHUTDOWN_SERVERS SYS curl --data "cmd=PWRoff" http://10.10.0.61/cmd @@ -188,7 +188,7 @@ CHECKACV_SERVICE(){ else errtime=$(expr `date +%s` - $(stat -c %Y ${logacv})) - [ $errtime -ge 3600 ] && echo "($datetime) - ${INPUTACV}V - Battery Voltage" >> ${logacv} + [ $errtime -ge 3600 ] && echo "($datetime) - ${BATTVOLT}V - Battery Voltage" >> ${logacv} battstatus=1 @@ -197,6 +197,7 @@ CHECKACV_SERVICE(){ [ $volt_diff -lt 0 ] && temp_diff=$(($volt_diff * -1)) if [ $volt_diff -gt 0 ]; then echo -e "($datetime) Battery Voltage: ${BATTVOLT}V" | mail -s "BATTERY VOLTAGE CHANGE" $email_alert + echo -e "($datetime) - ${BATTVOLT}V - Battery Voltage Change" >> ${logacv} last_battvolt=$BATTVOLT fi fi