Skip to content

Commit 6580b89

Browse files
committed
fix(alert): improve update alert messaging for clarity
* Updated alert messages in `fn_alert_update` and `fn_alert_update_failed` for better readability. * Changed alert action from `update-request` to `update-restart-request` in `fn_monitor_check_update_source`.
1 parent 4d0d110 commit 6580b89

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

lgsm/modules/alert.sh

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ fn_alert_monitor_query() {
9595
fn_alert_update() {
9696
# If previousbuild is set show transition, else fallback to single version.
9797
if [ -n "${previousbuild:-}" ] && [ -n "${localbuild:-}" ]; then
98-
fn_script_log_info "Sending alert: ${selfname} updated ${previousbuild} -> ${localbuild}"
99-
alertmessage="${selfname} has been updated: ${previousbuild} -> ${localbuild}."
98+
fn_script_log_info "Sending alert: ${selfname} updated: ${previousbuild} -> ${localbuild}"
99+
alertmessage="${selfname} updated: ${previousbuild} -> ${localbuild}."
100100
else
101-
fn_script_log_info "Sending alert: ${selfname} has received a game server update: ${localbuild}"
102-
alertmessage="${selfname} has received a game server update: ${localbuild}."
101+
fn_script_log_info "Sending alert: ${selfname} updated to ${localbuild}"
102+
alertmessage="${selfname} updated to ${localbuild}."
103103
fi
104104
alertaction="Updated"
105105
alertemoji="🎉"
@@ -114,30 +114,30 @@ fn_alert_update_failed() {
114114
# Expect updatefailureexpected (target version) and updatefailuregot (actual localbuild) if set
115115
local expected="${updatefailureexpected:-${remotebuild:-unknown}}"
116116
local got="${updatefailuregot:-${localbuild:-unknown}}"
117-
fn_script_log_error "Sending alert: ${selfname} update failed expected ${expected} got ${got}"
117+
fn_script_log_error "Sending alert: ${selfname} update failed: expected ${expected}, got ${got}"
118118
alertaction="Update Failed"
119119
alertemoji=""
120120
alertsound="2"
121-
alertmessage="${selfname} update failed. Expected ${expected} but is still ${got}. Manual intervention required."
121+
alertmessage="${selfname} update failed: expected ${expected}, got ${got}. Manual intervention required."
122122
# Red
123123
alertcolourhex="#cd0000"
124124
alertcolourdec="13434880"
125125
}
126126

127-
fn_alert_update_request() {
128-
fn_script_log_info "Sending alert: ${selfname} has requested an update and needs to be restarted."
129-
alertaction="Updating"
127+
fn_alert_update_restart_request() {
128+
fn_script_log_info "Sending alert: ${selfname} restart requested"
129+
alertaction="Restart Requested"
130130
alertemoji="🎉"
131131
alertsound="1"
132-
alertmessage="${selfname} has requested an update and needs to be restarted."
132+
alertmessage="${selfname} has requested a restart for an update to be applied. Restarting now."
133133
# Blue
134134
alertcolourhex="#1e90ff"
135135
alertcolourdec="2003199"
136136
}
137137

138138
fn_alert_check_update() {
139139
fn_script_log_info "Sending alert: ${gamename} update available: ${localbuild} -> ${remotebuild}"
140-
alertaction="Update available"
140+
alertaction="Update Available"
141141
alertemoji="🎉"
142142
alertsound="1"
143143
alertmessage="${gamename} update available: ${localbuild} -> ${remotebuild}"
@@ -147,7 +147,7 @@ fn_alert_check_update() {
147147
}
148148

149149
fn_alert_update_linuxgsm() {
150-
fn_script_log_info "Sending alert: ${selfname} has received an LinuxGSM update"
150+
fn_script_log_info "Sending alert: ${selfname} has received a LinuxGSM update"
151151
alertaction="Updated"
152152
alertemoji="🎉"
153153
alertsound="1"
@@ -230,8 +230,8 @@ elif [ "${alert}" == "update" ]; then
230230
fn_alert_update
231231
elif [ "${alert}" == "update-failed" ]; then
232232
fn_alert_update_failed
233-
elif [ "${alert}" == "update-request" ]; then
234-
fn_alert_update_request
233+
elif [ "${alert}" == "update-restart-request" ]; then
234+
fn_alert_update_restart_request
235235
elif [ "${alert}" == "check-update" ]; then
236236
fn_alert_check_update
237237
elif [ "${alert}" == "config" ]; then

lgsm/modules/command_monitor.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ fn_monitor_check_update_source() {
164164
fn_script_log_info "Checking update: CHECKING"
165165
fn_print_ok "Checking update"
166166
fn_print_ok_eol_nl
167-
fn_script_log_info "Checking update: ${selfname} has requested an update and needs to be restarted"
168-
alert="update-request"
167+
fn_script_log_info "Checking update: ${selfname} has requested a restart for an update to be applied"
168+
alert="update-restart-request"
169169
alert.sh
170170
command_restart.sh
171171
core_exit.sh

0 commit comments

Comments
 (0)