This commit is contained in:
2025-06-24 20:44:34 -05:00
parent 82682e1089
commit eba05ef64f
2 changed files with 6 additions and 12 deletions

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
PW_VERS='2.11.1-06242025'
PW_VERS='2.11.2-06242025'
noheader=' update service dailytemp confsync -r -report test '

View File

@@ -846,9 +846,7 @@ AVERAGETEMP(){
CHECKTEMP_SERVICE(){
cw=20
[ "${PW_SERVICE_TEMP_SCANRATE}" != "" ] && runEvery=${PW_SERVICE_TEMP_SCANRATE} || runEvery=1
[ "${PW_SCAN_THREADS}" != "" ] && SCAN_THREADS=${PW_SCAN_THREADS} || SCAN_THREADS=4
[[ "${IP}" != "10.6."* ]] && SENDTEMPS "TEMP Service Startup" &
[ ! -d ${PW_TMPFOLDER}/.lastfancheck ] && mkdir ${PW_TMPFOLDER}/.lastfancheck
[ ! -d ${PW_TMPFOLDER}/.lastinsert ] && mkdir ${PW_TMPFOLDER}/.lastinsert
@@ -859,16 +857,11 @@ CHECKTEMP_SERVICE(){
while true; do
start=$(date +%s)
log_start=$(date "+%Y-%m-%d %H:%M:%S")
source ${PW_FOLDER}/defaults.inc
source ${PW_FOLDER}/conf/settings.conf
[ "${PW_SERVICE_TEMP_SCANRATE}" != "" ] && runEvery=${PW_SERVICE_TEMP_SCANRATE} || runEvery=1
[ "${PW_SCAN_THREADS}" != "" ] && SCAN_THREADS=${PW_SCAN_THREADS} || SCAN_THREADS=4
# time="$(date +%H)$(date +%M)"
# if [ ! -f ${PW_TMPFOLDER}/temp.* ] && [ $(date +%H)$(date +%M) -ge 0700 ] && [ $(date +%H)$(date +%M) -lt 0705 ]; then
# if [ ! -f ${PW_TMPFOLDER}/.sentdaily ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.sentdaily)) -gt 600 ]; then
# touch ${PW_TMPFOLDER}/.sentdaily
# SENDTEMPS "Daily Temp Readings" yes &
# fi
# fi
SENSORS_CHECKED=()
for SENSORa in ${PW_SENSOR_ORD[@]}; do
until [ $(ls ${PW_TMPFOLDER}/ztemprun.*.running 2>/dev/null | wc -l) -lt ${SCAN_THREADS} ]; do
@@ -910,7 +903,8 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
logtemp=${PW_LOGFOLDER}/log-temp-${SENSORa}
touch ${PW_TMPFOLDER}/ztemprun.${SENSORa}.running
source ${PW_FOLDER}/defaults.inc
# source ${PW_FOLDER}/defaults.inc
[ "${PW_ESXI_DEF_FANSPEED}" != "" ] && ESXI_DEF_FANSPEED=${PW_ESXI_DEF_FANSPEED} || ESXI_DEF_FANSPEED=${PW_ESXI_DEF_FANSPEED}
[ "${PW_ESXI_FANSPEED_GL_ZONE}" != "" ] && ESXI_FANSPEED_GL_ZONE=${PW_ESXI_FANSPEED_GL_ZONE} || ESXI_FANSPEED_GL_ZONE=2.5