Update power.inc.sh
This commit is contained in:
@@ -994,8 +994,6 @@ 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`
|
||||
|
||||
echo "1: ${OFFSITE_WATTS}"
|
||||
|
||||
if (( $(bc <<<"${OFFSITE_WATTS} < 100") )); then
|
||||
TOTAL_MISC_WATTS=0; TOTAL_MISC_AMPS=0
|
||||
for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do
|
||||
@@ -1003,13 +1001,11 @@ POWERLOGGER_SERVICE(){
|
||||
TOTAL_MISC_WATTS=`echo "scale=2; ${TOTAL_MISC_WATTS}+${WATT}" | bc`
|
||||
TOTAL_MISC_AMPS=`echo "scale=2; ${TOTAL_MISC_AMPS}+${AMP}" | bc`
|
||||
done
|
||||
echo "2: ${TOTAL_MISC_WATTS}"
|
||||
if (( $(bc <<<"${OFFSITE_WATTS} < ${TOTAL_MISC_WATTS}") )); then
|
||||
OFFSITE_WATTS=${TOTAL_MISC_WATTS}
|
||||
OFFSITE_AMPS=${TOTAL_MISC_AMPS}
|
||||
fi
|
||||
fi
|
||||
echo "HERE: ${OFFSITE_WATTS}"
|
||||
QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['offsite-ups']}','${LogDataTime}','${OFFSITE_VOLTOUT}','${OFFSITE_AMPS}','${OFFSITE_WATTS}')"
|
||||
${mysql_conn} -e "USE servermonitor; ${QRY}"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user