From d2fb70ee8ecb160c89604e2fc70c40ad66b7b76b Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Thu, 2 Aug 2018 14:52:30 +0800 Subject: [PATCH] Add assembly and startup scripts for oap server Add a new assembly xml file to oap-starter project, and add `oapService.sh/bat` files to apm-dist project. Remove `collectorService.sh/bat` scripts from apm-dist project. --- .../{collectorService.bat => oapService.bat} | 12 ++-- .../{collectorService.sh => oapService.sh} | 22 +++---- apm-dist/bin/startup.bat | 2 +- apm-dist/bin/startup.sh | 4 +- apm-dist/pom.xml | 4 +- apm-dist/src/main/assembly/binary.xml | 6 +- oap-server/server-starter/pom.xml | 54 +++++++++++++++++ .../src/main/assembly/assembly.xml | 58 +++++++++++++++++++ .../src/main/assembly/log4j2.xml | 44 ++++++++++++++ 9 files changed, 181 insertions(+), 25 deletions(-) rename apm-dist/bin/{collectorService.bat => oapService.bat} (71%) rename apm-dist/bin/{collectorService.sh => oapService.sh} (61%) create mode 100644 oap-server/server-starter/src/main/assembly/assembly.xml create mode 100644 oap-server/server-starter/src/main/assembly/log4j2.xml diff --git a/apm-dist/bin/collectorService.bat b/apm-dist/bin/oapService.bat similarity index 71% rename from apm-dist/bin/collectorService.bat rename to apm-dist/bin/oapService.bat index b16ee1b1a..299b1a6b8 100644 --- a/apm-dist/bin/collectorService.bat +++ b/apm-dist/bin/oapService.bat @@ -17,12 +17,12 @@ @echo off setlocal -set COLLECTOR_PROCESS_TITLE=Skywalking-Collector -set COLLECTOR_HOME=%~dp0%.. -set COLLECTOR_OPTS="-Xms256M -Xmx512M -Dcollector.logDir=%COLLECTOR_HOME%\logs" +set OAP_PROCESS_TITLE=Skywalking-Collector +set OAP_HOME=%~dp0%.. +set OAP_OPTS="-Xms256M -Xmx512M -Doap.logDir=%OAP_HOME%\logs" -set CLASSPATH=%COLLECTOR_HOME%\config;.; -set CLASSPATH=%COLLECTOR_HOME%\collector-libs\*;%CLASSPATH% +set CLASSPATH=%OAP_HOME%\config;.; +set CLASSPATH=%OAP_HOME%\oap-libs\*;%CLASSPATH% if defined JAVA_HOME ( set _EXECJAVA="%JAVA_HOME%\bin\java" @@ -33,5 +33,5 @@ if not defined JAVA_HOME ( set _EXECJAVA=java ) -start "%COLLECTOR_PROCESS_TITLE%" %_EXECJAVA% "%COLLECTOR_OPTS%" -cp "%CLASSPATH%" org.apache.skywalking.apm.collector.boot.CollectorBootStartUp +start "%OAP_PROCESS_TITLE%" %_EXECJAVA% "%OAP_OPTS%" -cp "%CLASSPATH%" org.apache.skywalking.oap.server.starter.OAPServerStartUp endlocal diff --git a/apm-dist/bin/collectorService.sh b/apm-dist/bin/oapService.sh similarity index 61% rename from apm-dist/bin/collectorService.sh rename to apm-dist/bin/oapService.sh index b7b40826a..ed49bc9aa 100644 --- a/apm-dist/bin/collectorService.sh +++ b/apm-dist/bin/oapService.sh @@ -18,33 +18,33 @@ PRG="$0" PRGDIR=`dirname "$PRG"` -[ -z "$COLLECTOR_HOME" ] && COLLECTOR_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` +[ -z "$OAP_HOME" ] && OAP_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` -COLLECT_LOG_DIR="${COLLECTOR_HOME}/logs" +OAP_LOG_DIR="${OAP_HOME}/logs" JAVA_OPTS=" -Xms256M -Xmx512M" -if [ ! -d "${COLLECTOR_HOME}/logs" ]; then - mkdir -p "${COLLECT_LOG_DIR}" +if [ ! -d "${OAP_HOME}/logs" ]; then + mkdir -p "${OAP_LOG_DIR}" fi _RUNJAVA=${JAVA_HOME}/bin/java [ -z "$JAVA_HOME" ] && _RUNJAVA=java -CLASSPATH="$COLLECTOR_HOME/config:$CLASSPATH" -for i in "$COLLECTOR_HOME"/collector-libs/*.jar +CLASSPATH="$OAP_HOME/config:$CLASSPATH" +for i in "$OAP_HOME"/oap-libs/*.jar do CLASSPATH="$i:$CLASSPATH" done -COLLECTOR_OPTIONS=" -Dcollector.logDir=${COLLECT_LOG_DIR}" +OAP_OPTIONS=" -Doap.logDir=${OAP_LOG_DIR}" -eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} ${COLLECTOR_OPTIONS} -classpath $CLASSPATH org.apache.skywalking.apm.collector.boot.CollectorBootStartUp \ - 2>${COLLECT_LOG_DIR}/collector.log 1> /dev/null &" +eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} ${OAP_OPTIONS} -classpath $CLASSPATH org.apache.skywalking.oap.server.starter.OAPServerStartUp \ + 2>${OAP_LOG_DIR}/oap.log 1> /dev/null &" if [ $? -eq 0 ]; then sleep 1 - echo "SkyWalking Collector started successfully!" + echo "SkyWalking OAP started successfully!" else - echo "SkyWalking Collector started failure!" + echo "SkyWalking OAP started failure!" exit 1 fi diff --git a/apm-dist/bin/startup.bat b/apm-dist/bin/startup.bat index 4feecf3ba..f9d274737 100644 --- a/apm-dist/bin/startup.bat +++ b/apm-dist/bin/startup.bat @@ -17,6 +17,6 @@ @echo off setlocal -call "%~dp0"\collectorService.bat start +call "%~dp0"\oapService.bat start call "%~dp0"\webappService.bat start endlocal diff --git a/apm-dist/bin/startup.sh b/apm-dist/bin/startup.sh index 72cd520ae..343fda2b2 100644 --- a/apm-dist/bin/startup.sh +++ b/apm-dist/bin/startup.sh @@ -18,9 +18,9 @@ PRG="$0" PRGDIR=`dirname "$PRG"` -COLLECTOR_EXE=collectorService.sh +OAP_EXE=oapService.sh WEBAPP_EXE=webappService.sh -"$PRGDIR"/"$COLLECTOR_EXE" +"$PRGDIR"/"OAP_EXE" "$PRGDIR"/"$WEBAPP_EXE" diff --git a/apm-dist/pom.xml b/apm-dist/pom.xml index 458256bee..d4a6318c3 100644 --- a/apm-dist/pom.xml +++ b/apm-dist/pom.xml @@ -38,12 +38,12 @@ org.apache.skywalking - apm-collector-boot + server-starter ${project.version} org.apache.skywalking - apm-collector-boot + apm-webapp ${project.version} diff --git a/apm-dist/src/main/assembly/binary.xml b/apm-dist/src/main/assembly/binary.xml index 193e69343..35c41e9ea 100644 --- a/apm-dist/src/main/assembly/binary.xml +++ b/apm-dist/src/main/assembly/binary.xml @@ -36,7 +36,7 @@ 0755 - ${project.basedir}/../apm-collector/apm-collector-boot/target/skywalking-collector-assembly/skywalking-collector/config + ${project.basedir}/../oap-server/server-starter/target/skywalking-oap-assembly/skywalking-oap/config /config *.yml @@ -44,8 +44,8 @@ - ${project.basedir}/../apm-collector/apm-collector-boot/target/skywalking-collector-assembly/skywalking-collector/libs - /collector-libs + ${project.basedir}/../oap-server/server-starter/target/skywalking-oap-assembly/skywalking-oap/libs + /oap-libs diff --git a/oap-server/server-starter/pom.xml b/oap-server/server-starter/pom.xml index 5119310f2..27abb83ab 100644 --- a/oap-server/server-starter/pom.xml +++ b/oap-server/server-starter/pom.xml @@ -51,6 +51,11 @@ cluster-zookeeper-plugin ${project.version} + + org.apache.skywalking + cluster-kubernetes-plugin + ${project.version} + @@ -82,4 +87,53 @@ + + skywalking-oap + + + maven-compiler-plugin + + ${compiler.version} + ${compiler.version} + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-resources-plugin + + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + application.yml + log4j2.xml + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + assembly + package + + single + + + + src/main/assembly/assembly.xml + + + + + + + \ No newline at end of file diff --git a/oap-server/server-starter/src/main/assembly/assembly.xml b/oap-server/server-starter/src/main/assembly/assembly.xml new file mode 100644 index 000000000..0f234cd79 --- /dev/null +++ b/oap-server/server-starter/src/main/assembly/assembly.xml @@ -0,0 +1,58 @@ + + + + assembly + + dir + + + + /libs + runtime + + + + + src/main/assembly + /config + + log4j2.xml + + + + src/main/resources + + application.yml + log4j2.xml + component-libraries.yml + + /config + + + ${project.basedir}/../apm-collector-instrument/target + + collector-instrument-agent.jar + + /agent + + + diff --git a/oap-server/server-starter/src/main/assembly/log4j2.xml b/oap-server/server-starter/src/main/assembly/log4j2.xml new file mode 100644 index 000000000..939fc04ed --- /dev/null +++ b/oap-server/server-starter/src/main/assembly/log4j2.xml @@ -0,0 +1,44 @@ + + + + + + ${sys:oap.logDir} + + + + + %d - %c -%-4r [%t] %-5p %x - %m%n + + + + + + + + + + + + + + + + -- GitLab