diff --git a/defaults.inc b/defaults.inc index a5007246..66947175 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.2.59-08242023' +VERS='2.2.60-09082023' noheader=' update service dailytemp ' diff --git a/powerwall.sh b/powerwall.sh index 5aa2bf06..92292e78 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -255,7 +255,6 @@ CHECKTEMP_SERVICE(){ touch ${PW_TMPFOLDER}/temp.warn if [ $temp_diff -gt 1 ] || [ "${last_temp[${SENSOR}]}" = "1" ]; then SENDNOTICE "${SENSOR} TEMP WARNING" "($datetime) WARNING TEMP: ${temp_f}'F - (Difference of ${temp_diff}')" 1 - echo "($datetime) - ${temp_f}'F - alert sent" >> ${logtemp} last_temp[${SENSOR}]=$temp_f echo "($datetime) - ${temp_f}'F - WARNING TEMP - (Difference of ${temp_diff}')" >> ${logtemp} fi @@ -266,7 +265,6 @@ CHECKTEMP_SERVICE(){ SENDNOTICE "${SENSOR} TEMP CRITICAL" "($datetime) CRITICAL TEMP: ${temp_f}'F - (Difference of ${temp_diff}') Shutting down servers!!" 1 echo "($datetime) - ${temp_f}'F - CRITICAL - (Difference of ${temp_diff}'F)" >> ${logtemp} - echo "($datetime) - ${temp_f}'F - alert sent" >> ${logtemp} echo -e "($datetime) - ${SENSOR} - ${temp_f}'F - CRITICAL TEMP - (Difference of ${temp_diff}')" >> ${PW_LOGFILE} last_temp[${SENSOR}]=$temp_f SHUTDOWN_MAIN ${SENSOR} & @@ -276,15 +274,13 @@ Shutting down servers!!" 1 elif [ $(bc -l <<< "$temp_f >= $temp_crit_sys") -eq 1 ]; then touch ${PW_TMPFOLDER}/temp.critsys if [ $temp_diff -gt 1 ] || [ "${last_temp[${SENSOR}]}" = "1" ]; then - SENDNOTICE "${SENSOR} TEMP CRITICAL" "($datetime) SYSTEM CRITICAL TEMP: ${temp_f}'F - (Difference of ${temp_diff}') -Shutting down system servers!!" 1 + SENDNOTICE "${SENSOR} TEMP CRITICAL" "($datetime) SYSTEM CRITICAL TEMP: ${temp_f}'F - (Difference of ${temp_diff}')" 1 echo "($datetime) - ${temp_f}'F - SYSTEM CRITICAL - (Difference of ${temp_diff})" >> ${logtemp} - echo "($datetime) - ${temp_f}'F - alert sent" >> ${logtemp} echo -e "($datetime) - ${temp_f}'F - ${SENSOR} - CRITICAL TEMP SYSTEM - (Difference of ${temp_diff}')" >> ${PW_LOGFILE} last_temp[${SENSOR}]=$temp_f SHUTDOWN_SYS ${SENSOR} TEMP & SHUTDOWN_CRIT ${SENSOR} & - echo -e "($datetime) - ${temp_f}'F - Shutting down SYS servers" >> ${logtemp} + echo -e "($datetime) - ${temp_f}'F - Sending system shutdown signals, if applicable. Check main Powerwall Logs" >> ${logtemp} fi else @@ -292,7 +288,6 @@ Shutting down system servers!!" 1 SENDNOTICE "${SENSOR} BACK TO NORMAL" "($datetime) NORMAL TEMP: ${temp_f}'F Previous Temp: ${last_temp[${SENSOR}]}'F" echo -e "($datetime) - ${temp_f}'F - Back to NORMAL TEMP - Previous Temp: ${last_temp[${SENSOR}]}'F" >> ${logtemp} - echo "($datetime) - ${temp_f}'F - alert sent" >> ${logtemp} echo -e "($datetime) - ${temp_f}'F - ${SENSOR} - Back to NORMAL TEMP" >> ${PW_LOGFILE} [ "$(compgen -G "${PW_FOLDER}/shutdown.*")" != "" ] && rm -f ${PW_FOLDER}/shutdown.* @@ -475,7 +470,6 @@ CHECKPOWER_SERVICE(){ echo "($datetime) - ${INPUTACV}V - Back to Normal Voltage" >> ${PW_LOGPOWER} SENDNOTICE "POWER NOMINAL AGAIN" "($datetime) Normal voltage detected VOLTAGE: ${INPUTACV}V" - echo "($datetime) alert sent" >> ${PW_LOGPOWER} echo -e "($datetime) - ${INPUTACV}V - POWER NOMINAL AGAIN" >> ${PW_LOGFILE} battstatus=0 else @@ -499,7 +493,6 @@ CHECKPOWER_SERVICE(){ SENDNOTICE "POWER ALERT - POWER OFF/LOW POWER!!" "($datetime) Power off or low voltage detected VOLTAGE: ${INPUTACV}V BATT VOLTAGE: ${BATTVOLT}V" 1 - echo "($datetime) alert sent" >> ${PW_LOGPOWER} last_battvolt=$BATTVOLT fi voltstatus=3 @@ -708,6 +701,7 @@ SHUTDOWN_SYS(){ SENDNOTICE "SYS SERVERS SHUTDOWN" "($datetime) SYS servers have been shutdown ${reason}" 1 echo -e "($datetime) - SYS servers have been shutdown, ${reason}" >> ${PW_LOGFILE} + echo -e "($datetime) - ${temp_f}'F - Shutting down SYS servers" >> ${logtemp} fi # curl --data "cmd=PWRoff" http://10.10.0.61/cmd