Update temp.inc.sh
This commit is contained in:
@@ -288,13 +288,18 @@ CHECKTEMP_SERVICE(){
|
|||||||
# fi
|
# fi
|
||||||
SENSORS_CHECKED=()
|
SENSORS_CHECKED=()
|
||||||
for SENSORa in ${PW_SENSOR_ORD[@]}; do
|
for SENSORa in ${PW_SENSOR_ORD[@]}; do
|
||||||
|
touch ${PW_TMPFOLDER}/ztemprun.${SENSORa}.running
|
||||||
|
until [ $(ls ${PW_TMPFOLDER}/ztemprun.*.running 2>/dev/null | wc -l) -gt 0 ]: do
|
||||||
|
tmp=tmp
|
||||||
|
done
|
||||||
|
echo "checking ${SENSORa}"
|
||||||
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)
|
||||||
until [ "${completed}" == "true" ]; do
|
until [ "${completed}" == "true" ]; do
|
||||||
for sensor in ${PW_TMPFOLDER}/zservicerun.*.done; do
|
for sensor in ${PW_TMPFOLDER}/ztemprun.*.done; do
|
||||||
if [ "$(grep -oP '(?<=zservicerun.).*?(?=.done)' <<< "${sensor}")" != "*" ]; then
|
if [ "$(grep -oP '(?<=ztemprun.).*?(?=.done)' <<< "${sensor}")" != "*" ]; then
|
||||||
rm -f ${sensor}
|
rm -f ${sensor}
|
||||||
((s_count++))
|
((s_count++))
|
||||||
fi
|
fi
|
||||||
@@ -314,7 +319,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
|
|||||||
SENSORa=${1}
|
SENSORa=${1}
|
||||||
logtemp=${PW_LOGFOLDER}/log-temp-${SENSORa}
|
logtemp=${PW_LOGFOLDER}/log-temp-${SENSORa}
|
||||||
[ ! -f ${logtemp} ] && touch ${logtemp}
|
[ ! -f ${logtemp} ] && touch ${logtemp}
|
||||||
[ -f ${PW_TMPFOLDER}/zservicerun.${SENSORa}.done ] && rm -f ${PW_TMPFOLDER}/zservicerun.${SENSORa}.done
|
[ -f ${PW_TMPFOLDER}/ztemprun.${SENSORa}.done ] && rm -f ${PW_TMPFOLDER}/ztemprun.${SENSORa}.done
|
||||||
[ $(expr `date +%s` - $(stat -c %Y ${logtemp})) -ge $(echo "scale=0; ${PW_LOG_INTERVAL_NORMAL}*60" | bc) ] && relog=1 || relog=0
|
[ $(expr `date +%s` - $(stat -c %Y ${logtemp})) -ge $(echo "scale=0; ${PW_LOG_INTERVAL_NORMAL}*60" | bc) ] && relog=1 || relog=0
|
||||||
|
|
||||||
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "lacrosse" ] || ([ "${PW_REMOTE_SENSORS[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_REMOTE_SENSORS[${SENSORa}]})" != "false" ]) || ([ "${PW_HOST_ADDRESSES[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_HOST_ADDRESSES[${SENSORa}]})" != "false" ]); then
|
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "lacrosse" ] || ([ "${PW_REMOTE_SENSORS[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_REMOTE_SENSORS[${SENSORa}]})" != "false" ]) || ([ "${PW_HOST_ADDRESSES[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_HOST_ADDRESSES[${SENSORa}]})" != "false" ]); then
|
||||||
@@ -650,7 +655,8 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
|
|||||||
echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSORa} Sensor - ERROR reading sensor data" >> ${logtemp}
|
echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSORa} Sensor - ERROR reading sensor data" >> ${logtemp}
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
touch ${PW_TMPFOLDER}/zservicerun.${SENSORa}.done
|
rm -f ${PW_TMPFOLDER}/ztemprun.${SENSORa}.running
|
||||||
|
touch ${PW_TMPFOLDER}/ztemprun.${SENSORa}.done
|
||||||
}
|
}
|
||||||
|
|
||||||
SENDTEMPS(){
|
SENDTEMPS(){
|
||||||
|
|||||||
Reference in New Issue
Block a user