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 0000000000000000000000000000000000000000..1325f563b2edd5ae3578442de8887c4949660a97 --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/bin/collector-service.bat @@ -0,0 +1,20 @@ +@echo off + +setlocal +set COLLECOTR_PROCESS_TITLE=Skywalking-Collector +set COLLECTOR_BASE_PATH=%~dp0%.. +set COLLECTOR_RUNTIME_OPTIONS="-Xms256M -Xmx512M" + +set CLASSPATH=%COLLECTOR_BASE_PATH%\config; +SET CLASSPATH=%COLLECTOR_BASE_PATH%\libs\*;%CLASSPATH% + +if ""%JAVA_HOME%"" == """" ( + set _EXECJAVA=java +) else ( + set _EXECJAVA="%JAVA_HOME%"/bin/java +) + +start /MIN "%COLLECOTR_PROCESS_TITLE%" %_EXECJAVA% "%COLLECTOR_RUNTIME_OPTIONS%" -cp "%CLASSPATH%" com.a.eye.skywalking.collector.worker.CollectorBootStartUp & +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 0000000000000000000000000000000000000000..5f5d5a9e782f0ad226609da39f73cc663af1bded --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/bin/collector-service.sh @@ -0,0 +1,33 @@ +#!/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" +JAVA_OPTS=" -Xms256M -Xmx512M" + +if [ ! -d "${COLLECTOR_HOME}/logs" ]; then + mkdir -p "${COLLECTOR_LOGS_DIR}" +fi + +_RUNJAVA=${JAVA_HOME}/bin/java +[ -z "$JAVA_HOME" ] && _RUNJAVA=`java` + +CLASSPATH="$COLLECTOR_HOME/config:$CLASSPATH" +for i in "$COLLECTOR_HOME"/libs/*.jar +do + CLASSPATH="$i:$CLASSPATH" +done + +echo "Starting collector...." +eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} -classpath $CLASSPATH com.a.eye.skywalking.collector.worker.CollectorBootStartUp \ + 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 0000000000000000000000000000000000000000..d2e3f015fdeaa2a1c3d974854c09ab0ff24f4364 --- /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 0000000000000000000000000000000000000000..a5486fb571d7ffbd33622fd9c47e7b8d383e95ff --- /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 b3968863471e23acd2ebe2975cd67a0bc7938d1c..26bb6e55fac1def45d1efc08377495f70a392f72 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 @@ -54,4 +55,44 @@ RELEASE + + + skywalking-collector + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + + *.xml + *.config + + + + ${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 0000000000000000000000000000000000000000..7dc44e3dd992ad567895fb3b84010acfb26ebc4a --- /dev/null +++ b/skywalking-collector/skywalking-collector-worker/src/main/assembly/assembly.xml @@ -0,0 +1,42 @@ + + + + tar.gz + zip + + + + /libs + runtime + + + + + ${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 diff --git a/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml b/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml index a97644db35849bdb74b75f972f10feeed06e933c..e7ad5ffe0814426043aa4eee8038025426705c0b 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml +++ b/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml @@ -1,19 +1,26 @@ - + + + ../logs + - - - + + + %d - %c -%-4r [%t] %-5p %x - %m%n + + + + + + - - - - - - - - + + + + + - + \ No newline at end of file