diff --git a/inc/power.inc.sh b/inc/power.inc.sh index ac8708d6..2f9cea87 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -974,13 +974,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 - 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}" - fi + + fi + + 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) + 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 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