From 889b7c461e5d68df11b6d8940b693f6cd982b7e1 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 30 Dec 2023 14:33:51 -0600 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index ff59f447..a614b8fc 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -317,6 +317,13 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ 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_REMOTE_SENSORS[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_REMOTE_SENSORS[${SENSORa}]})" != "false" ]); then + if [ -f ${PW_TMPFOLDER}/${SENSORa}-error.sent ]; then + SENDNOTICE "${SENSORa} Data" "${SENSORa} is reporting data again" + echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSORa} - Sensor is reporting data again" >> ${logtemp} + rm -f ${PW_TMPFOLDER}/${SENSORa}-error.* + elif [ $(ls ${PW_TMPFOLDER}/${SENSORa}-error.* 2>/dev/null | wc -l) -gt 0 ]; then + rm -f ${PW_TMPFOLDER}/${SENSORa}-error.* + fi if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then vHOST_TEMPNAMES=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSORa}]} .1.3.6.1.4.1.674.10892.5.4.700.20.1.8 -O vq | sed -e 's/"//g' | sed -e 's/ Temp//g') IFS=$'\n' @@ -402,13 +409,8 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ SENDNOTICE "${SENSOR} Data" "${SENSOR} is reporting data again" echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSOR} - Sensor is reporting data again" >> ${logtemp} rm -f ${PW_TMPFOLDER}/${SENSOR}-error.* - fi - echo -en "Checking ${SENSOR}=($(ls ${PW_TMPFOLDER}/${SENSOR}-error.* 2>/dev/null | wc -l)) - " - if [ $(ls ${PW_TMPFOLDER}/${SENSOR}-error.* 2>/dev/null | wc -l) -gt 0 ]; then - echo "deleting" + elif [ $(ls ${PW_TMPFOLDER}/${SENSOR}-error.* 2>/dev/null | wc -l) -gt 0 ]; then rm -f ${PW_TMPFOLDER}/${SENSOR}-error.* - else - echo "not deleting" fi if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "cpu" ]; then