diff --git a/defaults.inc b/defaults.inc index 478147db..3718fc4e 100755 --- a/defaults.inc +++ b/defaults.inc @@ -58,7 +58,6 @@ PW_REMOTE_SENSORS['Powerwall-CPU']='127.0.0.1' PW_REMOTE_SENSORS['ServerRoomTH']='10.10.20.10' PW_REMOTE_SENSORS['OctoPI-CPU']='10.10.1.80' -# PW_SENSOR_ORD=(vMS-iDrac0 vMS-iDrac1 vMS-iDrac2 vMS-iDrac6 vMS-iDrac7 vMS-iDrac8 ServerRoomTH Powerwall-CPU OctoPI-CPU) PW_SENSOR_ORD=(vMS-iDrac0 vMS-iDrac1 vMS-iDrac6 vMS-iDrac7 vMS-Offsite-iDrac1 ServerRoomTH Powerwall-CPU OctoPI-CPU) declare -A PW_SENSOR_ID diff --git a/powerwall.sh b/powerwall.sh index 9bb14aca..7e07112f 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -189,8 +189,8 @@ CHECKTEMP_SERVICE(){ logtime=$(expr `date +%s` - $(stat -c %Y ${logtemp})) [ ${logtime} -ge 3600 ] && relog=1 || relog=0 - # if ([ "${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 ([ "${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}.down ]; then SENDNOTICE "${SENSORa} Online" "${SENSORa} Sensor is back online" echo "($datetime) - ${SENSORa} - Sensor is back online" >> ${logtemp}