initial pass at container-level scaling

plugins/checks/check-deploy

@@ -24,7 +24,7 @@
 # The default behavior is to wait for 5 seconds before running the first check,
 # and timeout each check to 30 minutes.
 #
-# By default, checks will be retried 5 times.  
+# By default, checks will be retried 5 times.
 
 # You can change these by setting WAIT, TIMEOUT and ATTEMPTS to different values, for
 # example:
@@ -86,7 +86,7 @@ if [[ ! -s "${TMPDIR}/CHECKS" ]] ; then
 
   # simple default check to see if the container stuck around
   # for more thorough checks, create a CHECKS file
-  DOKKU_DEFAULT_WAIT=$((WAIT+TIMEOUT))
+  DOKKU_DEFAULT_WAIT=10
   dokku_log_info1 "Waiting for $DOKKU_DEFAULT_WAIT seconds ..."
   sleep $DOKKU_DEFAULT_WAIT
 
@@ -116,15 +116,15 @@ do
   ATTEMPT=$(( ATTEMPT + 1 ))
   dokku_log_info1 "Attempt $ATTEMPT/$ATTEMPTS Waiting for $WAIT seconds ..."
   sleep $WAIT
-  
-  
+
+
   # -q           do not use .curlrc (must come first)
   # --compressed Test compression handled correctly
   # --fail       Fail on server errors (4xx, 5xx)
   # --location   Follow redirects
   CURL_OPTIONS="-q --compressed --fail --location --max-time $TIMEOUT"
-  
-  
+
+
   exec < "$FILENAME"
   while read CHECK_URL EXPECTED ; do
     # Ignore empty lines and lines starting with #
@@ -132,14 +132,14 @@ do
     [[ -z "$CHECK_URL" || "$CHECK_URL" =~ ^\# ]] && continue
     # Ignore variables
     [[ "$CHECK_URL" =~ ^.+= ]] && continue
-  
+
     if [[ "$CHECK_URL" =~ ^https?: ]] ; then
       URL_PROTOCOL=${CHECK_URL%:*}
       CHECK_URL=${CHECK_URL#*:}
     else
       URL_PROTOCOL="http"
     fi
-  
+
     if [[ "$CHECK_URL" =~ ^//.+ ]] ; then
       # To test a URL with specific host name, we still make request to localhost,
       # but we set Host header to $SEND_HOST.
@@ -149,22 +149,22 @@ do
       UNPREFIXED=${CHECK_URL#//}
       URL_HOSTNAME=${UNPREFIXED%%/*}
       URL_PATHNAME=${UNPREFIXED#$URL_HOSTNAME}
-  
+
       HEADERS="-H Host:$URL_HOSTNAME"
     else
       URL_HOSTNAME=localhost
       URL_PATHNAME=$CHECK_URL
     fi
-  
+
     # This URL will show up in the messages
     LOG_URL="$URL_PROTOCOL://$URL_HOSTNAME$URL_PATHNAME"
     # And how we formulate the CURL request
     CURL_ARGS="$CURL_OPTIONS $URL_PROTOCOL://$DOKKU_APP_LISTEN_IP:$DOKKU_APP_LISTEN_PORT$URL_PATHNAME $HEADERS"
-  
+
     dokku_log_verbose "CHECKS expected result:"
     dokku_log_verbose "$LOG_URL => \"$EXPECTED\""
     [[ $DOKKU_TRACE ]] && dokku_log_verbose "$ curl $CURL_ARGS"
-  
+
     # Capture HTTP response or CURL error message
     if OUTPUT=$(curl -# $CURL_ARGS 2>&1) ; then
       # OUTPUT contains the HTTP response
@@ -178,7 +178,7 @@ do
       FAILEDCHECKS=$(( FAILEDCHECKS + 1 ))
     fi
   done
-  
+
   if [ $FAILEDCHECKS -gt 0 ]; then
       dokku_log_warn "Check attempt $ATTEMPT/$ATTEMPTS failed."
       SUCCESS=0