Update temp.inc.sh
This commit is contained in:
@@ -845,7 +845,7 @@ CHECKTEMP_SERVICE(){
|
|||||||
[ "${PW_SERVICE_TEMP_SCANRATE}" != "" ] && runEvery=${PW_SERVICE_TEMP_SCANRATE} || runEvery=1
|
[ "${PW_SERVICE_TEMP_SCANRATE}" != "" ] && runEvery=${PW_SERVICE_TEMP_SCANRATE} || runEvery=1
|
||||||
|
|
||||||
SCAN_THREADS=4
|
SCAN_THREADS=4
|
||||||
[[ "${IP}" != "10.6."* ]] && SENDTEMPS "TEMP Service Startup" &
|
# [[ "${IP}" != "10.6."* ]] && SENDTEMPS "TEMP Service Startup" &
|
||||||
[ ! -d ${PW_TMPFOLDER}/.lastfancheck ] && mkdir ${PW_TMPFOLDER}/.lastfancheck
|
[ ! -d ${PW_TMPFOLDER}/.lastfancheck ] && mkdir ${PW_TMPFOLDER}/.lastfancheck
|
||||||
[ ! -d ${PW_TMPFOLDER}/.lastinsert ] && mkdir ${PW_TMPFOLDER}/.lastinsert
|
[ ! -d ${PW_TMPFOLDER}/.lastinsert ] && mkdir ${PW_TMPFOLDER}/.lastinsert
|
||||||
[ -d ${PW_TMPFOLDER}/.lasttemp ] && rm -Rf ${PW_TMPFOLDER}/.lasttemp
|
[ -d ${PW_TMPFOLDER}/.lasttemp ] && rm -Rf ${PW_TMPFOLDER}/.lasttemp
|
||||||
@@ -866,11 +866,10 @@ CHECKTEMP_SERVICE(){
|
|||||||
# fi
|
# fi
|
||||||
SENSORS_CHECKED=()
|
SENSORS_CHECKED=()
|
||||||
for SENSORa in ${PW_SENSOR_ORD[@]}; do
|
for SENSORa in ${PW_SENSOR_ORD[@]}; do
|
||||||
echo "HERE: ${SENSORa}"
|
|
||||||
until [ $(ls ${PW_TMPFOLDER}/ztemprun.*.running 2>/dev/null | wc -l) -lt ${SCAN_THREADS} ]; do
|
until [ $(ls ${PW_TMPFOLDER}/ztemprun.*.running 2>/dev/null | wc -l) -lt ${SCAN_THREADS} ]; do
|
||||||
tmp=tmp
|
tmp=tmp
|
||||||
done
|
done
|
||||||
CHECKTEMP_SERVICE_RUNSENSOR ${SENSORa} &
|
CHECKTEMP_SERVICE_RUNSENSOR ${SENSORa}
|
||||||
SENSORS_CHECKED+=(${SENSORa})
|
SENSORS_CHECKED+=(${SENSORa})
|
||||||
done
|
done
|
||||||
s_count=0; completed=false; scanstart=$(date +%s)
|
s_count=0; completed=false; scanstart=$(date +%s)
|
||||||
@@ -1610,6 +1609,7 @@ SENDTEMP(){
|
|||||||
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" != "esxi" ] && ([ "${PW_SENSOR_TYPE[${SENSORa}]}" == "lacrosse" ] || ([ "${PW_REMOTE_SENSORS[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_REMOTE_SENSORS[${SENSORa}]})" != "false" ])); then
|
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" != "esxi" ] && ([ "${PW_SENSOR_TYPE[${SENSORa}]}" == "lacrosse" ] || ([ "${PW_REMOTE_SENSORS[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_REMOTE_SENSORS[${SENSORa}]})" != "false" ])); then
|
||||||
SENSORS_CHECK=(${SENSORa})
|
SENSORS_CHECK=(${SENSORa})
|
||||||
for SENSOR in "${SENSORS_CHECK[@]}"; do
|
for SENSOR in "${SENSORS_CHECK[@]}"; do
|
||||||
|
echo "HERE: ${SENSOR} - ${SENSORa}"
|
||||||
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "cpu" ]; then
|
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "cpu" ]; then
|
||||||
GAUGESH="'%"
|
GAUGESH="'%"
|
||||||
elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then
|
elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user