[incubator-hugegraph-toolchain] branch master updated: fix(hubble): fix debug mode error & check in ci (#419)

[je...@apache.org]

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

jermy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph-toolchain.git


The following commit(s) were added to refs/heads/master by this push:
     new cc820d97 fix(hubble): fix debug mode error & check in ci  (#419)
cc820d97 is described below

commit cc820d9778367d8fef2961f9bdf00126db0219d0
Author: 青年 <10...@qq.com>
AuthorDate: Fri Jan 13 23:39:53 2023 +0800

    fix(hubble): fix debug mode error & check in ci  (#419)
---
 .github/workflows/hubble-ci.yml                                  | 8 ++++++++
 hugegraph-hubble/hubble-dist/assembly/static/bin/start-hubble.sh | 7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/hubble-ci.yml b/.github/workflows/hubble-ci.yml
index 29dbb2f9..26056465 100644
--- a/.github/workflows/hubble-ci.yml
+++ b/.github/workflows/hubble-ci.yml
@@ -82,6 +82,14 @@ jobs:
       - name: Prepare env and service
         run: |
           sudo pip install -r ${TRAVIS_DIR}/requirements.txt
+          cd hugegraph-hubble
+          mvn package -Dmaven.test.skip=true
+          cd apache-hugegraph-hubble-incubating*
+          cd bin
+          ./start-hubble.sh -d
+          ./stop-hubble.sh
+          cd ../../../
+          pwd
           $TRAVIS_DIR/install-hugegraph.sh $COMMIT_ID
 
       - name: Unit test
diff --git a/hugegraph-hubble/hubble-dist/assembly/static/bin/start-hubble.sh b/hugegraph-hubble/hubble-dist/assembly/static/bin/start-hubble.sh
index b15b3c49..3b059800 100644
--- a/hugegraph-hubble/hubble-dist/assembly/static/bin/start-hubble.sh
+++ b/hugegraph-hubble/hubble-dist/assembly/static/bin/start-hubble.sh
@@ -50,6 +50,7 @@ for jar in "${LIB_PATH}"/*.jar; do
 done
 
 java_opts="-Xms512m"
+java_debug_opts=""
 while [[ $# -gt 0 ]]; do
     case $1 in
         --help|-help|-h)
@@ -57,7 +58,7 @@ while [[ $# -gt 0 ]]; do
         exit 0
         ;;
         --debug|-d)
-        java_opts="$java_opts -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
+        java_debug_opts=" -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
         ;;
     esac
     shift
@@ -78,8 +79,8 @@ args=${CONF_PATH}/hugegraph-hubble.properties
 log=${LOG_PATH}/hugegraph-hubble.log
 
 echo -n "starting HugeGraphHubble "
-nohup nice -n 0 java -server "${java_opts}" -Dhubble.home.path="${HOME_PATH}" \
--cp "${class_path}" ${main_class} "${args}" > "${log}" 2>&1 < /dev/null &
+nohup nice -n 0 java -server ${java_opts} ${java_debug_opts} -Dhubble.home.path="${HOME_PATH}" \
+  -cp ${class_path} ${main_class} ${args} > ${log} 2>&1 < /dev/null &
 pid=$!
 echo ${pid} > "${PID_FILE}"