diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 2d300479..fc59b6eb 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -13,8 +13,8 @@ GET_HOST_FANSPEED(){ FanSpeed=$(echo ${vHOSTFAN} | awk '/ / {print $8}' | sed -e 's/%//g') fi fi - echo ${FanSpeed} - # echo ${FanSpeed} > ${PW_TMPFOLDER}/.fanspeed.${PW_ESXI_HOST_NAMES[${1}]}.${2} + # echo ${FanSpeed} + echo ${FanSpeed} > ${PW_TMPFOLDER}/.fanspeed.${PW_ESXI_HOST_NAMES[${1}]}.${2} } START_POWERWALL_FAN(){ pwmconfig & @@ -30,7 +30,7 @@ START_POWERWALL_FAN(){ CHECKTEMP(){ start=`date +%s` cw=25 - # cdt=$(date +%Y-%m-%d-%H-%M-%S) + cdt=$(date +%Y-%m-%d-%H-%M-%S) while [ $# -gt 0 ]; do case "$1" in -a|-avg) avgdays=${2};; @@ -44,7 +44,7 @@ CHECKTEMP(){ if [ "${temptype}" != "sensors" ]; then for ESXIHOST in "${PW_ALLHOSTS[@]}"; do if [ ! -f ${PW_TMPFOLDER}/${PW_ESXI_HOST_NAMES[${ESXIHOST}]}.down ] && ([ "${search}" == "" ] || [[ "${PW_ESXI_HOST_NAMES[${ESXIHOST}],,}" = *"${search,,}"* ]]); then - FanSpeed=$(GET_HOST_FANSPEED ${ESXIHOST}) + GET_HOST_FANSPEED ${ESXIHOST} ${cdt} fi done [ "${PW_DEFAULT_ESXI_FANSPEED}" != "" ] && DEFAULT_ESXI_FANSPEED=${PW_DEFAULT_ESXI_FANSPEED} || DEFAULT_ESXI_FANSPEED=30 @@ -128,7 +128,8 @@ CHECKTEMP(){ echo -en "${idsCL[LightCyan]} Getting FanSpeed and calculating ${avgdays_disp} average..." else echo -en "${idsCL[LightCyan]} Getting FanSpeed..." - fi + fi + [ ! -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt} ] && until [ -f ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt} ]; do tmp=tmp; done RPM=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSOR}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq) [ "${avgdays}" != "noavg" ] && fan_average=$(bc <<< "scale=0; $(ROUNDHALVES $(bc <<< "scale=3; $(AVERAGETEMP ${SENSOR} ${avgdays} FanSpeed)/10"))*10/1") echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR} Host Sensors ${idsST[Reset]}${idsCL[White]}[${vHOSTiDRACIP}]" @@ -140,7 +141,7 @@ CHECKTEMP(){ else FSC="${idsCL[LightYellow]}" fi - echo -en "${idsCL[LightCyan]} [FanSpeed=${FSC}${FanSpeed}${idsST[Reset]}${idsCL[LightCyan]}'% " + echo -en "${idsCL[LightCyan]} [FanSpeed=${FSC}$(cat ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt})${idsST[Reset]}${idsCL[LightCyan]}'% " if [ "${avgdays}" != "noavg" ]; then echo -e "${idsCL[LightYellow]} AVG=${fan_average}'%${idsCL[LightCyan]}]${idsCL[Default]}" else