diff --git a/apm-backend-dist/bin/startup.sh b/apm-backend-dist/bin/startup.sh index 57d0c76d71a0e318594a4f66bc7164798998af9f..875c450de7fe66730f693b24b5d73ef867fb5606 100644 --- a/apm-backend-dist/bin/startup.sh +++ b/apm-backend-dist/bin/startup.sh @@ -7,4 +7,4 @@ WEBAPP_EXE=webappService.sh exec "$PRGDIR"/"$COLLECTOR_EXE" start -exec "$PRGDIR"/"$COLLECTOR_EXE" start +exec "$PRGDIR"/"$WEBAPP_EXE" start diff --git a/apm-backend-dist/bin/webappService.sh b/apm-backend-dist/bin/webappService.sh index 9c51fb9f3eec4cbaa6330ae7598f7cc4304cc79a..d36779a201d4df041f59f7dfd94d011b0fc447de 100644 --- a/apm-backend-dist/bin/webappService.sh +++ b/apm-backend-dist/bin/webappService.sh @@ -1,27 +1,27 @@ -#!/usr/bin/env sh - -PRG="$0" -PRGDIR=`dirname "$PRG"` -[ -z "$WEBAPP_HOME" ] && $WEBAPP_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` - -WEBAPP_LOG_DIR="${$WEBAPP_HOME}/logs" -JAVA_OPTS=" -Xms256M -Xmx512M" -JAR_PATH="${$WEBAPP_HOME}/webapp" - -if [ ! -d "${$WEBAPP_HOME}/logs" ]; then - mkdir -p "${WEBAPP_LOG_DIR}" -fi - -_RUNJAVA=${JAVA_HOME}/bin/java -[ -z "$JAVA_HOME" ] && _RUNJAVA=java - -eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} -jar ${JAR_PATH}/skywalking-webapp.jar \ - 2>${WEBAPP_LOG_DIR}/webapp.log 1> /dev/null &" - -if [ $? -eq 0 ]; then - sleep 1 - echo "Skywalking Web Application started successfully!" -else - echo "Skywalking Web Application started failure!" - exit 1 -fi +#!/usr/bin/env sh + +PRG="$0" +PRGDIR=`dirname "$PRG"` +[ -z "$WEBAPP_HOME" ] && $WEBAPP_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` + +WEBAPP_LOG_DIR="${WEBAPP_HOME}/logs" +JAVA_OPTS=" -Xms256M -Xmx512M" +JAR_PATH="${WEBAPP_HOME}/webapp" + +if [ ! -d "${WEBAPP_HOME}/logs" ]; then + mkdir -p "${WEBAPP_LOG_DIR}" +fi + +_RUNJAVA=${JAVA_HOME}/bin/java +[ -z "$JAVA_HOME" ] && _RUNJAVA=java + +eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} -jar ${JAR_PATH}/skywalking-webapp.jar \ + 2>${WEBAPP_LOG_DIR}/webapp.log 1> /dev/null &" + +if [ $? -eq 0 ]; then + sleep 1 + echo "Skywalking Web Application started successfully!" +else + echo "Skywalking Web Application started failure!" + exit 1 +fi