Mirrored_Repos/msm
1
0
Fork 0
mirror of https://github.com/msmhq/msm.git synced 2024-08-30 18:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed two bugs in the interrupt handler.

Browse Source 
It would always find the stop and restart counters for a server to be
running, and then always print out the server name of used in the
command, even if it was another server being stopped prematurely.
This commit is contained in:
Marcus Whybrow 2012-05-31 02:26:13 +01:00
parent 856eedfade
commit 828f108be1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
msm
View File

@ -1356,21 +1356,22 @@ init() {
interrupt() {
local exit_message="false"
for ((i=0; $i<$num_servers; i++)); do
if [[ "${STOP_COUNTDOWN[$i]}" ]] && server_is_running $i; then
if [[ "${STOP_COUNTDOWN[$i]}" == "true" ]] && server_is_running $i; then
if [[ "$exit_message" == "false" ]]; then
echo -e "\nInterrupted..."
exit_message="true"
fi
server_eval $i "say ${server_stop_abort[$i]}"
echo "Server \"${server_name[$id]}\" shutdown was aborted."
echo "Server \"${server_name[$i]}\" shutdown was aborted."
fi
if [[ "${RESTART_COUNTDOWN[$i]}" ]] && server_is_running $i; then
if [[ "${RESTART_COUNTDOWN[$i]}" == "true" ]] && server_is_running $i; then
if [[ "$exit_message" == "false" ]]; then
echo -e "\nInterrupted..."
exit_message="true"
fi
server_eval $i "say ${server_restart_abort[$i]}"
echo "Server \"${server_name[$id]}\" restart was aborted."
echo "Server \"${server_name[$i]}\" restart was aborted."
fi
done
exit