From 783b2ff7cd8365150c0ce00edbacd49e4ca33e30 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 19 Jun 2025 19:38:45 -0500 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 0cd8e297..bcf6227e 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -843,7 +843,6 @@ AVERAGETEMP(){ CHECKTEMP_SERVICE(){ cw=20 [ "${PW_SERVICE_TEMP_SCANRATE}" != "" ] && runEvery=${PW_SERVICE_TEMP_SCANRATE} || runEvery=1 - rm -f ${PW_TMPFOLDER}/.lastfancheck/* SCAN_THREADS=4 [[ "${IP}" != "10.6."* ]] && SENDTEMPS "TEMP Service Startup" & @@ -1097,8 +1096,9 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ ##### ESXI FAN CONTROL ##### elif [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${SENSORa}]}"* ]] && [[ "${vSENSOR}" = *"Exhaust"* ]] && [ "${FanSpeed}" != "" ]; then - if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.chkset ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.chkset)) -ge 300 ]; then - if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ]; then + if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.chkset ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.chkset)) -ge 300 ] || [ ${FanSpeed} -ge 90 ] ; then + if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ] || [ ${FanSpeed} -ge 90 ] ; then + [ ${FanSpeed} -ge 90 ] && rm -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.* NEW_FanSpeed=$(GET_DEFAULT_FANSPEED ${SENSORa} ${FanSpeed}) SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FanSpeed Control" "Re-enabling Host Fan control to Powerwall. Setting fans to: ${NEW_FanSpeed}%" ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${ESXI_PASS}" raw 0x30 0x30 0x01 0x00 >/dev/null 2>&1 @@ -1181,16 +1181,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ fi elif [ "${FanSpeed}" != "" ]&& [ ${FanSpeed} -ge 90 ] && [ ! -f ${PW_TMPFOLDER}/temp.* ]; then - if [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${SENSORa}]}"* ]]; then - NEW_FanSpeed=$(GET_DEFAULT_FANSPEED ${SENSORa} ${FanSpeed}) - SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FanSpeed Control" "Re-enabling Host Fan control to Powerwall. Setting fans to: ${NEW_FanSpeed}%" - ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSORa}]} -U ${PW_ESXI_USER} -P "${ESXI_PASS}" raw 0x30 0x30 0x01 0x00 >/dev/null 2>&1 - [ "${SENSORa}" == "iDS-vMS-Host7" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"10.10.2.26"* ]] && ipmitool -I lanplus -H 10.10.2.26 -U ${PW_ESXI_USER} -P "${ESXI_PASS}" raw 0x30 0x30 0x01 0x00 >/dev/null 2>&1 - SET_ESXI_FANSPEED ${NEW_FanSpeed} ${SENSORa} e >/dev/null 2>&1 & - else - SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FAN ISSUE?!" "Possible fan issue, currently running at ${FanSpeed}%" 1 - fi - + SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FAN ISSUE?!" "Possible fan issue, currently running at ${FanSpeed}%" 1 fi fi