Daniel Gibbs 4 лет назад
Родитель
Сommit
d3f51a4a46
2 измененных файлов с 43 добавлено и 2 удалено
  1. 39 2
      lgsm/functions/alert.sh
  2. 4 0
      lgsm/functions/command_stop.sh

+ 39 - 2
lgsm/functions/alert.sh

@@ -31,7 +31,7 @@ fn_alert_log(){
 }
 
 fn_alert_test(){
-	fn_script_log_info "Sending test alert"
+	fn_script_log_info "Sending alert: test"
 	alerttitle="Alert - ${selfname} - Test"
 	alertemoji="🚧"
 	alertsound="1"
@@ -41,6 +41,28 @@ fn_alert_test(){
 	alertcolourdec="13487360"
 }
 
+fn_alert_stopping(){
+	fn_script_log_info "Sending alert: test"
+	alerttitle="Alert - ${selfname} - Stopping"
+	alertemoji="🟡"
+	alertsound="1"
+	alerttriggermessage="${selfname} is stopping."
+	# Amber
+	alertcolourhex="#ffbf00"
+	alertcolourdec="16760576"
+}
+
+fn_alert_stopped(){
+	fn_script_log_info "Sending test alert"
+	alerttitle="Alert - ${selfname} - Test"
+	alertemoji="🔴"
+	alertsound="1"
+	alerttriggermessage="${selfname} has stopped."
+	# Red
+	alertcolourhex="#cdcd00"
+	alertcolourdec="13487360"
+}
+
 fn_alert_restart(){
 	fn_script_log_info "Sending alert: Restarted: ${selfname}, ${executable} is not running"
 	alerttitle="Alert - ${selfname} - Restarted"
@@ -68,7 +90,7 @@ fn_alert_update(){
 	alerttitle="Alert - ${selfname} - Game server updated"
 	alertemoji="🎉"
 	alertsound="1"
-	alerttriggermessage="${selfname} has received an game server update."
+	alerttriggermessage="${selfname} has received a game server update."
 	# Green
 	alertcolourhex="#00cd00"
 	alertcolourdec="52480"
@@ -129,6 +151,17 @@ fn_alert_wipe(){
 	alertcolourdec="52480"
 }
 
+fn_alert_test(){
+	fn_script_log_info "Sending info alert"
+	alerttitle="Alert - ${selfname} - Info"
+	alertemoji="👾"
+	alertsound="1"
+	alerttriggermessage="Game server information."
+	# Green
+	alertcolourhex="#1e90ff"
+	alertcolourdec="2003199"
+}
+
 # Gather info required for alert.
 info_distro.sh
 info_game.sh
@@ -199,6 +232,10 @@ alerticonalt="${gamename} icon"
 
 if [ "${alert}" == "permissions" ]; then
 	fn_alert_permissions
+elif [ "${alert}" == "stopping" ]; then
+	fn_alert_stopping
+elif [ "${alert}" == "stopped" ]; then
+	fn_alert_stopping
 elif [ "${alert}" == "restart" ]; then
 	fn_alert_restart
 elif [ "${alert}" == "restartquery" ]; then

+ 4 - 0
lgsm/functions/command_stop.sh

@@ -256,6 +256,8 @@ fn_stop_pre_check(){
 		fn_print_info_nl "${servername} is already stopped"
 		fn_script_log_error "${servername} is already stopped"
 	else
+		alert="stopping"
+		alert.sh
 		# Select graceful shutdown.
 		fn_stop_graceful_select
 	fi
@@ -273,6 +275,8 @@ info_game.sh
 fn_stop_pre_check
 # Remove lockfile.
 if [ -f "${lockdir}/${selfname}.lock" ]; then
+	alert="stopped"
+	alert.sh
 	rm -f "${lockdir:?}/${selfname}.lock"
 fi