From abead77bc3b39331219163aa975cee0731e80e74 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 15 May 2024 21:33:40 -0500
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index a03e138e..8a8898fa 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -784,7 +784,7 @@ OFFSITE_CHECKPOWER_SERVICE(){
 			OFFSITE_BATT_RUNTIME=`echo "scale=2; ${OFFSITE_BATT_RUNTIME}/60" | bc`
 			OFFSITE_BATT_CAP=$(echo "${upsinfo}" | grep 'battery.charge:' | sed 's/.*: //')
 			
-			if [ ${OFFSITE_WATTS} -lt 100 ]; then
+			if (( $(bc <<<"${OFFSITE_WATTS} < 100") )); then
 				TOTAL_MISC_WATTS=0
 				for mSENSOR in "${!OFFSITE_MISC[@]}"; do
 					IFS=: read -r AMP WATT VOLT <<< ${OFFSITE_MISC[${mSENSOR}]}; unset IFS
@@ -975,18 +975,14 @@ POWERLOGGER_SERVICE(){
 		
 			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['ServerRoom-AC']}','${LogDataTime}','${AIRCON_VOLT}','${AIRCON_AMP}','${AIRCON_WATT}')"
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
-			echo "HERE: ${SVRRM_WATT}"
 			if [ "${SVRRM_WATT}" != "" ]; then
-				echo YES
 				SVRRM_AMP_WAC=$(echo "scale=2; ${SVRRM_AMP}+${AIRCON_AMP}" | bc -l)
 				SVRRM_WATT_WAC=$(echo "scale=2; ${SVRRM_WATT}+${AIRCON_WATT}" | bc -l)
 				QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['total-wac']}','${LogDataTime}','${SVRRM_AMP_WAC}','${SVRRM_WATT_WAC}')"
 				${mysql_conn} -e "USE servermonitor; ${QRY}"
-			else
-				echo NO
 			fi
 		fi
-				
+		
 		if [ "${PW_OFFSITE_MONITOR}" = "$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)" ]; then
 			upsinfo=$(upsc CP1500PFCLCD 2>&1)
 		else
@@ -999,7 +995,7 @@ POWERLOGGER_SERVICE(){
 			OFFSITE_WATTS=`echo "scale=2; ${OFFSITE_LOAD}*$(echo "${upsinfo}" | grep 'ups.realpower.nominal:' | sed 's/.*: //')" | bc`
 			OFFSITE_AMPS=`echo "scale=2; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | bc`
 			
-			if [ ${OFFSITE_WATTS} -lt 100 ]; then
+			if (( $(bc <<<"${OFFSITE_WATTS} < 100") )); then
 				TOTAL_MISC_WATTS=0; TOTAL_MISC_AMPS=0
 				for mSENSOR in "${!OFFSITE_MISC[@]}"; do
 					IFS=: read -r AMP WATT VOLT <<< ${OFFSITE_MISC[${mSENSOR}]}; unset IFS