From ae36838b5c36306254ce3d2ba9e965e30eac5176 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Sun, 9 Apr 2017 22:23:10 +0800 Subject: [PATCH] Add packaging config file and shell script --- .../bin/collector-service.bat | 17 ++++++ .../bin/collector-service.sh | 27 ++++++++++ .../bin/startup.bat | 5 ++ .../bin/startup.sh | 7 +++ .../skywalking-collector-worker/pom.xml | 52 +++++++++++++++++++ .../src/main/assembly/assembly.xml | 42 +++++++++++++++ 6 files changed, 150 insertions(+) create mode 100644 skywalking-collector/skywalking-collector-worker/bin/collector-service.bat create mode 100644 skywalking-collector/skywalking-collector-worker/bin/collector-service.sh create mode 100644 skywalking-collector/skywalking-collector-worker/bin/startup.bat create mode 100644 skywalking-collector/skywalking-collector-worker/bin/startup.sh create mode 100644 skywalking-collector/skywalking-collector-worker/src/main/assembly/assembly.xml diff --git a/skywalking-collector/skywalking-collector-worker/bin/collector-service.bat b/skywalking-collector/skywalking-collector-worker/bin/collector-service.bat new file mode 100644 index 000000000..d86cbd33d --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/bin/collector-service.bat @@ -0,0 +1,17 @@ +@echo off + +setlocal +set COLLECOTR_PROCESS_TITLE=Skywalking-Collector +set COLLECTOR_BASE_PATH=%~dp0%.. +set COLLECTOR_RUNTIME_OPTIONS="-Xms256M -Xmx512M" + +if ""%JAVA_HOME%"" == """" ( + set _EXECJAVA=java +) else ( + set _EXECJAVA="%JAVA_HOME%"/bin/java +) + +start /MIN "%COLLECOTR_PROCESS_TITLE%" %_EXECJAVA% "%COLLECTOR_RUNTIME_OPTIONS%" -jar "%COLLECTOR_BASE_PATH%"/libs/skywalking-collector.jar & +echo Collector started successfully! + +endlocal diff --git a/skywalking-collector/skywalking-collector-worker/bin/collector-service.sh b/skywalking-collector/skywalking-collector-worker/bin/collector-service.sh new file mode 100644 index 000000000..e3cbf9733 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/bin/collector-service.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash + +PRG="$0" +PRGDIR=`dirname "$PRG"` +[ -z "$COLLECTOR_HOME" ] && COLLECTOR_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` + +COLLECTOR_LOGS_DIR="${COLLECTOR_HOME}/logs" +COLLECTOR_RUNTIME_OPTIONS=" -Xms256M -Xmx512M" + +if [ ! -d "${COLLECTOR_HOME}/logs" ]; then + mkdir -p "${COLLECTOR_LOGS_DIR}" +fi + +_RUNJAVA=${JAVA_HOME}/bin/java +[ -z "$JAVA_HOME" ] && _RUNJAVA=`java` + +echo "Starting collector...." +eval exec "\"$_RUNJAVA\" ${COLLECTOR_RUNTIME_OPTIONS} -jar ${COLLECTOR_HOME}/libs/skywalking-collector.jar \ + 2>${COLLECTOR_LOGS_DIR}/collector.log 1> /dev/null &" + +if [ $? -eq 0 ]; then + sleep 1 + echo "Collector started successfully!" +else + echo "Collector started failure!" + exit 1 +fi diff --git a/skywalking-collector/skywalking-collector-worker/bin/startup.bat b/skywalking-collector/skywalking-collector-worker/bin/startup.bat new file mode 100644 index 000000000..d2e3f015f --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/bin/startup.bat @@ -0,0 +1,5 @@ +@echo off + +setlocal +call "%~dp0"\collector-service.bat start +endlocal diff --git a/skywalking-collector/skywalking-collector-worker/bin/startup.sh b/skywalking-collector/skywalking-collector-worker/bin/startup.sh new file mode 100644 index 000000000..a5486fb57 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/bin/startup.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +PRG="$0" +PRGDIR=`dirname "$PRG"` +EXECUTABLE=collector-service.sh + +exec "$PRGDIR"/"$EXECUTABLE" start diff --git a/skywalking-collector/skywalking-collector-worker/pom.xml b/skywalking-collector/skywalking-collector-worker/pom.xml index b39688634..af4904ab1 100644 --- a/skywalking-collector/skywalking-collector-worker/pom.xml +++ b/skywalking-collector/skywalking-collector-worker/pom.xml @@ -14,6 +14,7 @@ 9.4.2.v20170220 + com.a.eye.skywalking.collector.worker.CollectorBootStartUp @@ -46,6 +47,12 @@ com.a.eye skywalking-sniffer-mock ${project.version} + + + org.apache.httpcomponents + httpclient + + test @@ -54,4 +61,49 @@ RELEASE + + + skywalking-collector + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + *.xml + *.config + + + false + + config/ + + + true + ${main.class} + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + assembly + package + + single + + + + src/main/assembly/assembly.xml + + + + + + + diff --git a/skywalking-collector/skywalking-collector-worker/src/main/assembly/assembly.xml b/skywalking-collector/skywalking-collector-worker/src/main/assembly/assembly.xml new file mode 100644 index 000000000..02239314b --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/main/assembly/assembly.xml @@ -0,0 +1,42 @@ + + + + tar.gz + zip + + + + /libs + compile + + + + + ${project.basedir}/bin + /bin + + *.sh + *.bat + + 0755 + + + src/main/resources + + collector.config + log4j2.xml + + /config + + + ${project.build.directory} + /libs + + ${build.finalName}.jar + + + + \ No newline at end of file