From 3f7bcf54180061e3404c88fd517ab0716d98b765 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 13 May 2023 09:24:47 -0500
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index 55482e50..eaf62af9 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -145,21 +145,21 @@ CHECKACV_SERVICE(){
 		datetime=`date +'%Y-%m-%d %H:%M:%S'`
 		if [ ${INPUTACV} -ge ${min_acvolt} ]; then
 			if [ $voltstatus -eq 3 ]; then
-				echo "($datetime) back to normal voltage: ${INPUTACV}V" >> ${logacv}
+				echo "($datetime) - ${INPUTACV}V - Back to Normal Voltage" >> ${logacv}
 				echo -e "($datetime) Normal voltage detected\nVOLTAGE: ${INPUTACV}V" | mail -s "POWER NOMINAL AGAIN" $email_alert
 				echo "($datetime) alert sent" >> ${logacv}
 				battstatus=0
 			else
 				errtime=$(expr `date +%s` - $(stat -c %Y ${logacv}))
-				[ $errtime -ge 3600 ] && echo "($datetime) normal voltage: ${INPUTACV}V" >> ${logacv}
+				[ $errtime -ge 3600 ] && echo "($datetime) - ${INPUTACV}V - Normal Voltage: ${INPUTACV}V" >> ${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) Service Startup - Normal voltage detected VOLTAGE: ${INPUTACV}V" >> ${logacv}
+					echo "($datetime) - ${INPUTACV}V - Service Startup - Normal voltage detected VOLTAGE" >> ${logacv}
 				fi
 			fi
 			voltstatus=1
 		else
-			echo "($datetime) LOW voltage: ${INPUTACV}V" >> ${logacv}
+			echo "($datetime) - ${INPUTACV}V - LOW Voltage" >> ${logacv}
 			if [ $voltstatus -lt 3 ]; then
 				echo -e "($datetime) Power off or low voltage detected\nVOLTAGE: ${INPUTACV}V\nBATT VOLTAGE: ${BATTVOLT}V" | mail -s "POWER ALERT - LOW POWER!!" $email_alert
 				echo "($datetime) alert sent" >> ${logacv}
@@ -167,9 +167,9 @@ CHECKACV_SERVICE(){
 			fi
 			voltstatus=3
 			if [ ${BATTVOLT%.*} -lt ${min_battvolt} ] && [ ${BATTVOLT%.*} -gt ${min_battvolt_sys} ]; then
-				echo "($datetime) LOW BATTERY voltage: ${BATTVOLT}V" >> ${logacv}
+				echo "($datetime) - ${INPUTACV}V - LOW BATTERY voltage" >> ${logacv}
 				if [ $battstatus -lt 2 ]; then
-					echo "($datetime) Shutting down main servers..." >> ${logacv}
+					echo "($datetime) - ${INPUTACV}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
@@ -178,7 +178,7 @@ CHECKACV_SERVICE(){
 			elif [ ${BATTVOLT%.*} -le ${min_battvolt_sys} ]; then
 				echo "($datetime) SYSTEM LOW BATTERY voltage: ${BATTVOLT}V" >> ${logacv}
 				if [ $battstatus -lt 3 ]; then
-					echo "($datetime) Shutting down all remaining servers..." >> ${logacv}
+					echo "($datetime) - ${INPUTACV}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
@@ -187,7 +187,8 @@ CHECKACV_SERVICE(){
 				fi
 				
 			else
-				[ $VERBOSE = true ] && echo "($datetime) Battery Voltage: ${BATTVOLT}V" >> ${logacv}
+				errtime=$(expr `date +%s` - $(stat -c %Y ${logacv}))
+				[ $errtime -ge 3600 ] && echo "($datetime) - ${INPUTACV}V - Battery Voltage" >> ${logacv}
 				
 				battstatus=1