From ed4d488e9344606f431b6fb9707d156a701188bf Mon Sep 17 00:00:00 2001
From: Zachary Duquette <zachary.duquette@eidosmontreal.com>
Date: Thu, 17 Aug 2017 15:36:10 -0400
Subject: [PATCH] Configure jetty start timeout using JETTY_START_TIMEOUT

Signed-off-by: Zachary Duquette <zachary.duquette@eidosmontreal.com>
---
 jetty-home/src/main/resources/bin/jetty.sh | 44 ++++++++++++++--------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/jetty-home/src/main/resources/bin/jetty.sh b/jetty-home/src/main/resources/bin/jetty.sh
index eec8b767ec2..069fd55ec30 100755
--- a/jetty-home/src/main/resources/bin/jetty.sh
+++ b/jetty-home/src/main/resources/bin/jetty.sh
@@ -90,6 +90,9 @@ NAME=$(echo $(basename $0) | sed -e 's/^[SK][0-9]*//' -e 's/\.sh$//')
 #   no effect if start-stop-daemon exists.  Useful when JETTY_USER does not
 #   have shell access, e.g. /bin/false
 #
+# JETTY_START_TIMEOUT
+#   Time spent waiting to see if startup was successful/failed. Defaults to 60 seconds
+#
 
 usage()
 {
@@ -129,7 +132,7 @@ running()
 started()
 {
   # wait for 60s to see "STARTED" in PID file, needs jetty-started.xml as argument
-  for T in 1 2 3 4 5 6 7 9 10 11 12 13 14 15
+  for ((T = 0; T < $(($3 / 4)); T++))
   do
     sleep 4
     [ -z "$(grep STARTED $1 2>/dev/null)" ] || return 0
@@ -152,20 +155,21 @@ readConfig()
 
 dumpEnv()
 {
-    echo "JAVA           =  $JAVA"
-    echo "JAVA_OPTIONS   =  ${JAVA_OPTIONS[*]}"
-    echo "JETTY_HOME     =  $JETTY_HOME"
-    echo "JETTY_BASE     =  $JETTY_BASE"
-    echo "START_D        =  $START_D"
-    echo "START_INI      =  $START_INI"
-    echo "JETTY_START    =  $JETTY_START"
-    echo "JETTY_CONF     =  $JETTY_CONF"
-    echo "JETTY_ARGS     =  ${JETTY_ARGS[*]}"
-    echo "JETTY_RUN      =  $JETTY_RUN"
-    echo "JETTY_PID      =  $JETTY_PID"
-    echo "JETTY_START_LOG=  $JETTY_START_LOG"
-    echo "JETTY_STATE    =  $JETTY_STATE"
-    echo "RUN_CMD        =  ${RUN_CMD[*]}"
+    echo "JAVA                  =  $JAVA"
+    echo "JAVA_OPTIONS          =  ${JAVA_OPTIONS[*]}"
+    echo "JETTY_HOME            =  $JETTY_HOME"
+    echo "JETTY_BASE            =  $JETTY_BASE"
+    echo "START_D               =  $START_D"
+    echo "START_INI             =  $START_INI"
+    echo "JETTY_START           =  $JETTY_START"
+    echo "JETTY_CONF            =  $JETTY_CONF"
+    echo "JETTY_ARGS            =  ${JETTY_ARGS[*]}"
+    echo "JETTY_RUN             =  $JETTY_RUN"
+    echo "JETTY_PID             =  $JETTY_PID"
+    echo "JETTY_START_LOG       =  $JETTY_START_LOG"
+    echo "JETTY_STATE           =  $JETTY_STATE"
+    echo "JETTY_START_TIMEOUT   =  $JETTY_START_TIMEOUT"
+    echo "RUN_CMD               =  ${RUN_CMD[*]}"
 }
 
 
@@ -378,6 +382,14 @@ then
   echo "** WARNING: JETTY_LOGS is Deprecated. Please configure logging within the jetty base." >&2
 fi
 
+#####################################################
+# Set STARTED timeout
+#####################################################
+if [ -z "$JETTY_START_TIMEOUT"]
+then
+  JETTY_START_TIMEOUT=60
+fi
+
 #####################################################
 # Are we running on Windows? Could be, with Cygwin/NT.
 #####################################################
@@ -485,7 +497,7 @@ case "$ACTION" in
 
     if expr "${JETTY_ARGS[*]}" : '.*jetty-started.xml.*' >/dev/null
     then
-      if started "$JETTY_STATE" "$JETTY_PID"
+      if started "$JETTY_STATE" "$JETTY_PID" "$JETTY_START_TIMEOUT"
       then
         echo "OK `date`"
       else