From 91b2bd2f4d69a137dd07e895e1f92b56adcdf5d0 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 11 Feb 2024 07:34:28 -0600
Subject: [PATCH] Update power.inc.sh

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

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 27bda300..41554d28 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -803,7 +803,7 @@ POWERLOGGER_SERVICE(){
 			QRY="INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES ('${LogDataTime}','${INVSTATSINFO}')"
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
 		fi
-		
+		echo 1
 		if [ "$(CHECK_HOST ${PW_UPS_IP})" != "false" ]; then
 			SVRRM_VOLT=$(snmpwalk -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.2.1.1 | sed 's/.*: //')
 			SVRRM_VOLT=`echo "scale=1; ${SVRRM_VOLT}/10" | bc`
@@ -814,7 +814,7 @@ POWERLOGGER_SERVICE(){
 			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['total']}','${LogDataTime}','${SVRRM_VOLT}','${SVRRM_AMP}','${SVRRM_WATT}')"
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
 		fi
-
+		echo 2
 		if [ "$(CHECK_HOST ${PW_APCPDU_IP})" != "false" ]; then
 			APCPDU_AMP=$(snmpwalk -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.2.3.1.1.2.1 | sed 's/.*: //')
 			APCPDU_AMP=`echo "scale=1; ${APCPDU_AMP}/10" | bc`
@@ -826,7 +826,7 @@ POWERLOGGER_SERVICE(){
 			fi
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
 		fi
-		
+		echo 3
 		if [ "${SVRRM_VOLT}" != "" ] && [ "${APCPDU_AMP}" != "" ]; then
 			NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
 			NETRK_WATT=$(ROUND_NUMBER `echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc` 0)
@@ -834,7 +834,7 @@ POWERLOGGER_SERVICE(){
 			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['network-rack']}','${LogDataTime}','${SVRRM_VOLT}','${NETRK_AMP}','${NETRK_WATT}')"
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
 		fi
-		
+		echo 4
 		AIRCON_INFO=$(curl -m 3 -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID['ServerRoom-AC']} | jq '.dps')
 		if [ "${AIRCON_INFO}" != "" ]; then
 			AIRCON_AMP=$(echo "${AIRCON_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')
@@ -846,11 +846,9 @@ 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 1
 			if [ "${SVRRM_WATT}" != "" ]; then
 				SVRRM_AMP_WAC=$(echo "scale=2; ${SVRRM_AMP}+${AIRCON_AMP}" | bc -l)
 				SVRRM_WATT_WAC=$(echo "scale=2; ${SVRRM_WATT}+${AIRCON_WATT}" | bc -l)
-				echo "HERE: ${SVRRM_AMP} - ${AIRCON_AMP} - ${SVRRM_AMP_WAC} - ${SVRRM_WATT_WAC}"
 				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}"
 			fi