Merge pull request #81 from palantir/bad-sw-workaround

Workaround for bad environment management
palantir · Jul 3, 2016 · 32a0817 · 32a0817
2 parents 344c237 + 12aa4a5
commit 32a0817
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/main/resources/check.sh b/src/main/resources/check.sh
@@ -25,6 +25,13 @@ CHECK_ARGS="@checkArgs@"
 SERVICE_HOME=${SERVICE_HOME:-$(cd "$(dirname "$0")/../../../" && pwd)}
 cd "$SERVICE_HOME"
 
+# prefer java 8 when available to deal with poor environment management
+if [ -n "$JAVA_8_HOME" ]; then
+    export JAVA_HOME=$JAVA_8_HOME
+fi
+
+source service/bin/config.sh
+
 # now check health
 printf "%-50s" "Checking health of '$SERVICE'..."
 $SERVICE_CMD $CHECK_ARGS