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

Add check for successful server startup

Browse Source 
The server_start function always assumes successful startup, which
is confusing if the server didn't actually start.

More work needs to be done to trap and return the error on startup,
but for now, this at least lets the admin know the server didn't
actually start.
This commit is contained in:
Blaine Motsinger 2021-11-07 17:12:44 -06:00
parent 3c1e6ebadb
commit 93f3b96d88
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
init/msm
View File

@ -1432,14 +1432,21 @@ server_start() {
# Wait for the server to fully start
server_log_dots_for_lines "$1" "$time_now" "${SERVER_CONSOLE_EVENT_OUTPUT_START[$1]}" "${SERVER_CONSOLE_EVENT_TIMEOUT_START[$1]}"
if [[ -f "${SERVER_PATH[$1]}"/eula.txt ]]; then
if ! grep -q -i 'eula=true' "${SERVER_PATH[$1]}"/eula.txt; then
echo " Could not start the server as you first need to agree to an EULA. See eula.txt for more info (${SERVER_PATH[$1]}/eula.txt)."
return
# Ensure the server started
if server_is_running "$1"; then
echo " Done."
else
if [[ -f "${SERVER_PATH[$1]}"/eula.txt ]]; then
if ! grep -q -i 'eula=true' "${SERVER_PATH[$1]}"/eula.txt; then
echo " Failed."
echo "Could not start the server as you first need to agree to an EULA. See eula.txt for more info (${SERVER_PATH[$1]}/eula.txt)."
return
fi
fi
fi
echo " Done."
# TODO: trap and return the error to help troubleshoot startup issues
echo " Failed."
fi
fi
}