From 5f8e698ce5dd859a170191dc2134afa6ea8ad264 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 30 Dec 2023 11:46:14 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/power.inc.sh | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/defaults.inc b/defaults.inc index 41ee2694..e5890b39 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.83-12302023' +VERS='2.5.84-12302023' noheader=' update service dailytemp confsync ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 4519ca22..2f36764e 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -634,11 +634,12 @@ POWERLOGGER_SERVICE(){ if [[ "${HOST_WATTS}" != *"Timeout"* ]] && [ "${HOST_WATTS}" != "0" ]; then QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID[${SENSOR}]}','${LogDataTime}','${HOST_WATTS}')" ${mysql_conn} -e "USE servermonitor; ${QRY}" - rm -f ${PW_TMPFOLDER}/shutdown.${PW_HOST_IDRACS[${SENSOR}]} - [[ "${PW_OFFSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && { rm -f ${PW_TMPFOLDER}/shutdown.OFFSITE; rm -f ${PW_TMPFOLDER}/shutdown.ALL } - [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && { rm -f ${PW_TMPFOLDER}/shutdown.MAINSITE; rm -f ${PW_TMPFOLDER}/shutdown.ALL } - [[ "${PW_MAIN_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.MAIN; - [[ "${PW_SYS_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.SYS; + [ -f ${PW_TMPFOLDER}/shutdown.${PW_HOST_IDRACS[${SENSOR}]} ] && rm -f ${PW_TMPFOLDER}/shutdown.${PW_HOST_IDRACS[${SENSOR}]} + [ -f ${PW_TMPFOLDER}/shutdown.ALL ] && rm -f ${PW_TMPFOLDER}/shutdown.ALL + [[ "${PW_OFFSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.OFFSITE + [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.MAINSITE + [[ "${PW_MAIN_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.MAIN + [[ "${PW_SYS_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]] && rm -f ${PW_TMPFOLDER}/shutdown.SYS fi break fi