summaryrefslogtreecommitdiff
path: root/ambari-logsearch/ambari-logsearch-portal
diff options
context:
space:
mode:
authoroleewere <oleewere@gmail.com>2016-07-19 16:47:01 +0200
committeroleewere <oleewere@gmail.com>2016-07-19 17:02:26 +0200
commitea2105d48bc27e71f3300f8dc0fe310da60731d7 (patch)
treeb1dd57172c424abcf8d51b42ca69220257514628 /ambari-logsearch/ambari-logsearch-portal
parent20f1adbd9ff103c12363431c35d30c7a2065167c (diff)
AMBARI-17723. Setup docker dev environment for Log Search (oleewere)
Diffstat (limited to 'ambari-logsearch/ambari-logsearch-portal')
-rwxr-xr-xambari-logsearch/ambari-logsearch-portal/src/main/scripts/run.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/scripts/run.sh b/ambari-logsearch/ambari-logsearch-portal/src/main/scripts/run.sh
index ca587d5c63..4e8901dc56 100755
--- a/ambari-logsearch/ambari-logsearch-portal/src/main/scripts/run.sh
+++ b/ambari-logsearch/ambari-logsearch-portal/src/main/scripts/run.sh
@@ -46,11 +46,12 @@ fi
#Temporarily enabling JMX so we can monitor the memory and CPU utilization of the process
#JMX="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=3098"
+LOGSEARCH_DEBUG_SUSPEND=${LOGSEARCH_DEBUG_SUSPEND:-n}
if [ "$LOGSEARCH_DEBUG" = "true" ] && [ ! -z "$LOGSEARCH_DEBUG_PORT" ]; then
- LOGSEARCH_JAVA_OPTS="$LOGSEARCH_JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$LOGSEARCH_DEBUG_PORT,server=y,suspend=n "
+ LOGSEARCH_JAVA_OPTS="$LOGSEARCH_JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=$LOGSEARCH_DEBUG_PORT,server=y,suspend=$LOGSEARCH_DEBUG_SUSPEND "
fi
-if [ $LOGSEARCH_SSL = "true" ]; then
+if [ "$LOGSEARCH_SSL" = "true" ]; then
LOGSEARCH_JAVA_OPTS="$LOGSEARCH_JAVA_OPTS -Djavax.net.ssl.keyStore=$LOGSEARCH_KEYSTORE_LOCATION -Djavax.net.ssl.keyStoreType=$LOGSEARCH_KEYSTORE_TYPE -Djavax.net.ssl.keyStorePassword=$LOGSEARCH_KEYSTORE_PASSWORD -Djavax.net.ssl.trustStore=$LOGSEARCH_TRUSTSTORE_LOCATION -Djavax.net.ssl.trustStoreType=$LOGSEARCH_TRUSTSTORE_TYPE -Djavax.net.ssl.trustStorePassword=$LOGSEARCH_TRUSTSTORE_PASSWORD"
fi