This commit is contained in:
2023-03-04 21:59:00 -06:00
parent 7091142ef8
commit 08b563f855
2 changed files with 4 additions and 4 deletions

View File

@@ -54,5 +54,5 @@ MMUPDATECHECK(){
}
SENDNOTICE(){
[ "${EMAIL_NOTICE}" != "" ] && echo "${2}" | mail -s "${1}" ${EMAIL_NOTICE}
[ "${EMAIL_NOTICE}" != "" ] && echo -e "${2}\n\n$(date)" | mail -s "${1}" ${EMAIL_NOTICE}
}

View File

@@ -40,7 +40,7 @@ MMSTART(){
elif [ "${1}" = "check" ] && [ "$(ip link | grep "wg-torguard")" = "" ] && [ ! -f ${MMFOLDER}/mm.vpn* ]; then
GOFORSTART=true;
SENDNOTICE "Starting Media Management Systems" "$(date)"
SENDNOTICE "Starting Media Management Systems" ""
echo "$(date) - Starting Media Management system - (fresh start)" >> $logfile
echo -e "${idsCL[LightCyan]}Fresh startup${idsCL[Default]}"
@@ -122,14 +122,14 @@ PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf
exit 1
elif [ -f ${MMFOLDER}/mm.vpn.fail2 ]; then
echo "$(date) - VPN Failure #3 - Shutting down Media Management systems" >> $logfile
[ "${EMAIL_NOTICE}" != "" ] && echo SENDNOTICE "VPN Failure" "Final Failure, shutting down system"
SENDNOTICE "VPN Failure" "Final Failure, shutting down system"
MMSTOP
[ $VERBOSE = true ] && DEBUGLOGSTOP
exit 1
else
echo -e "${idsCL[Red]} failed, restarting system${idsCL[Default]}"
echo "$(date) - VPN Failure #1 - restarting system" >> $logfile
[ "${EMAIL_NOTICE}" != "" ] && echo SENDNOTICE "VPN Failure" "1st Failure, will try and restart the VPN"
SENDNOTICE "VPN Failure" "1st Failure, will try and restart the VPN"
touch ${MMFOLDER}/mm.vpn.fail
MMSTOP
sleep 30s