Daniel Gibbs 10 лет назад
Родитель
Сommit
21fd930b3d

+ 2 - 1
lgsm/functions/command_monitor.sh

@@ -84,7 +84,8 @@ fn_monitor_tmux(){
 		fn_print_fail "Checking session: "
 		fn_print_fail_eol_nl
 		fn_scriptlog "Checking session: FAIL"
-		fn_monitor_email_alert
+		alert="restart"
+		alert.sh
 		fn_scriptlog "Monitor is starting ${servername}"
 		sleep 1
 		command_start.sh

+ 1 - 3
lgsm/functions/command_test_alert.sh

@@ -11,10 +11,8 @@ function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
 check.sh
 info_config.sh
-if [ "${emailalert}" = "on" ]||[ "${pushbulletalert}" = "on" ]; then
-	alert="test"
+alert="test"
 	alert.sh
-else
 	fn_print_fail_nl "alerts not enabled"
 	fn_scriptlog "alerts not enabled"
 fi

+ 2 - 3
lgsm/functions/monitor_gsquery.sh

@@ -70,9 +70,8 @@ if [ "${gsquery}" == "yes" ]; then
 
 				# Send alert if enabled
 				if [ "${emailalert}" == "on" ]; then
-					subject="${servicename} Monitor - Starting ${servername}"
-					failurereason="Failed to query ${servicename}: ${gsquerycmd}"
-					actiontaken="restarted ${servicename}"
+
+					alert="queryrestart"
 					alert.sh
 				fi
 				fn_restart