From 745dcc0a42c651789fa7038e9b225b755dd2f46d Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Wed, 18 May 2016 20:39:28 +0100
Subject: [PATCH] alert messages being migrated to alert.sh

---
 lgsm/functions/alert.sh              | 48 +++++++++++++++++++++++++++-
 lgsm/functions/command_monitor.sh    |  3 +-
 lgsm/functions/command_test_alert.sh |  4 +--
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/lgsm/functions/alert.sh b/lgsm/functions/alert.sh
index c871394a2..6bfc8bda3 100644
--- a/lgsm/functions/alert.sh
+++ b/lgsm/functions/alert.sh
@@ -6,10 +6,56 @@ lgsm_version="140516"
 
 # Description: Overall function for managing alerts.
 
+fn_alert_test(){
+	fn_scriptlog "Sending test alert"
+	alertsubject="LGSM - Alert Check - ${servername}"
+	alertbody="LGSM test alert, how you read?"
+}
+
+fn_alert_restart(){
+	fn_scriptlog "Sending restart alert: ${executable} process not running"
+	alertsubject="LGSM - Restarted - ${servername}"
+	alertbody="${servicename} ${executable} process not running"
+}
+
+fn_alert_queryrestart(){
+	fn_scriptlog "Sending restart alert: ${gsquerycmd}"
+	alertsubject="LGSM - Restarted - ${servername}"
+	alertbody="Failed to Query: ${gsquerycmd}"
+}
+
+fn_alert_update(){
+	fn_scriptlog "Sending update alert"
+	alertsubject="LGSM - Updated - ${servername}"
+	alertbody="Recieved update: 154789"
+}
+
+if [ "${alert}" == "restart" ]; then
+	fn_alert_restart
+if [ "${alert}" == "queryrestart" ]; then
+	fn_alert_queryrestart
+elif [ "${alert}" == "update" ]; then
+	fn_alert_update
+elif [ "${alert}" == "test" ]; then
+	fn_alert_test
+fi
+
 if [ "${emailnotification}" == "on" ]||[ "${emailalert}" == "on" ]&&[ -n "${email}" ]; then
 	alert_email.sh
+elif [ "${emailnotification}" != "on" ]||[ "${emailalert}" != "on" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
+	fn_print_fail_nl "Alerts not enabled"
+	fn_scriptlog "Email alerts not enabled"	
+elif [ -z "${email}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
+	fn_print_fail_nl "Email no set"
+	fn_scriptlog "Email no set"		
 fi
 
-if [ "${pushbulletalert}" == "on" ]||[ -n "${pushbullettoken}" ]; then
+if [ "${pushbulletalert}" == "on" ]&&[ -n "${pushbullettoken}" ]; then
 	alert_pushbullet.sh
+elif [ "${pushbulletalert}" != "on" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
+	fn_print_fail_nl "Pushbullet alerts not enabled"
+	fn_scriptlog "Pushbullet alerts not enabled"
+elif [ -z "${pushbullettoken}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
+	fn_print_fail_nl "Pushbullet token not set"
+	fn_scriptlog "Pushbullet token not set"
 fi
\ No newline at end of file
diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh
index b86a6047d..917b544b7 100644
--- a/lgsm/functions/command_monitor.sh
+++ b/lgsm/functions/command_monitor.sh
@@ -57,7 +57,8 @@ fn_monitor_teamspeak3(){
 		fn_print_fail_eol_nl
 		fn_scriptlog "Checking session: ${ts3error}: FAIL"
 		failurereason="${ts3error}"
-		fn_monitor_email_alert
+		alert="restart"
+		alert.sh
 	fi
 	fn_scriptlog "Monitor is starting ${servername}"
 	sleep 1
diff --git a/lgsm/functions/command_test_alert.sh b/lgsm/functions/command_test_alert.sh
index 4b5e69de4..253ab07d3 100644
--- a/lgsm/functions/command_test_alert.sh
+++ b/lgsm/functions/command_test_alert.sh
@@ -12,9 +12,7 @@ function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 check.sh
 info_config.sh
 if [ "${emailalert}" = "on" ]||[ "${pushbulletalert}" = "on" ]; then
-	fn_scriptlog "Sending alert Check"
-	alertsubject="LGSM - Alert Check - ${servername}"
-	alertbody="LGSM testing alert, how you read?"
+	alert="test"
 	alert.sh
 else
 	fn_print_fail_nl "alerts not enabled"