From 93f3b96d8880d630543b2d5412deda496109d19a Mon Sep 17 00:00:00 2001
From: Blaine Motsinger <blaine@renderorange.com>
Date: Sun, 7 Nov 2021 17:12:44 -0600
Subject: [PATCH] Add check for successful server startup

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.
---
 init/msm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/init/msm b/init/msm
index 80e0fab..b6bb33f 100755
--- a/init/msm
+++ b/init/msm
@@ -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
 }