[ambari-logsearch] 16/28: AMBARI-24851 - Logsearch: debug mode using java 8 and 11 (#15)

[oleewere]

This is an automated email from the ASF dual-hosted git repository.

oleewere pushed a commit to branch cloudbreak
in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git

commit ab9e8c0e6228a5c530490ee2b5667d1c7e26bca1
Author: kasakrisz <33458261+kasakr...@users.noreply.github.com>
AuthorDate: Wed Oct 31 12:52:55 2018 +0100

    AMBARI-24851 - Logsearch: debug mode using java 8 and 11 (#15)
---
 ambari-logsearch-server/src/main/scripts/logsearch.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ambari-logsearch-server/src/main/scripts/logsearch.sh 
b/ambari-logsearch-server/src/main/scripts/logsearch.sh
index 1b64832..a821168 100755
--- a/ambari-logsearch-server/src/main/scripts/logsearch.sh
+++ b/ambari-logsearch-server/src/main/scripts/logsearch.sh
@@ -149,7 +149,12 @@ function start() {
   LOGSEARCH_DEBUG_PORT=${LOGSEARCH_DEBUG_PORT:-"5005"}
 
   if [ "$LOGSEARCH_DEBUG" = "true" ]; then
-    LOGSEARCH_JAVA_OPTS="$LOGSEARCH_JAVA_OPTS -Xdebug 
-Xrunjdwp:transport=dt_socket,address=*:$LOGSEARCH_DEBUG_PORT,server=y,suspend=$LOGSEARCH_DEBUG_SUSPEND
 "
+    if [ $java_version == "8" ]; then
+      LOGSEARCH_DEBUG_ADDRESS=$LOGSEARCH_DEBUG_PORT
+    else
+      LOGSEARCH_DEBUG_ADDRESS="*:$LOGSEARCH_DEBUG_PORT"
+    fi
+    LOGSEARCH_JAVA_OPTS="$LOGSEARCH_JAVA_OPTS -Xdebug 
-Xrunjdwp:transport=dt_socket,address=$LOGSEARCH_DEBUG_ADDRESS,server=y,suspend=$LOGSEARCH_DEBUG_SUSPEND
 "
   fi
 
   if [ "$LOGSEARCH_SSL" = "true" ]; then