diff --git a/skywalking-collector/skywalking-collector-worker/bin/collector-service.bat b/skywalking-collector/skywalking-collector-worker/bin/collector-service.bat index d86cbd33d9db266d1db60083364ff98684d4f4d6..1325f563b2edd5ae3578442de8887c4949660a97 100644 --- a/skywalking-collector/skywalking-collector-worker/bin/collector-service.bat +++ b/skywalking-collector/skywalking-collector-worker/bin/collector-service.bat @@ -5,13 +5,16 @@ 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%" -jar "%COLLECTOR_BASE_PATH%"/libs/skywalking-collector.jar & +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 index e3cbf973300863cdbdb307583cc6c19bed871bc7..3af711e50b3990fd3f0e3641fa5ee279e12b5848 100644 --- a/skywalking-collector/skywalking-collector-worker/bin/collector-service.sh +++ b/skywalking-collector/skywalking-collector-worker/bin/collector-service.sh @@ -5,7 +5,7 @@ PRGDIR=`dirname "$PRG"` [ -z "$COLLECTOR_HOME" ] && COLLECTOR_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` COLLECTOR_LOGS_DIR="${COLLECTOR_HOME}/logs" -COLLECTOR_RUNTIME_OPTIONS=" -Xms256M -Xmx512M" +JAVA_OPTS=" -Xms256M -Xmx512M" if [ ! -d "${COLLECTOR_HOME}/logs" ]; then mkdir -p "${COLLECTOR_LOGS_DIR}" @@ -14,8 +14,17 @@ fi _RUNJAVA=${JAVA_HOME}/bin/java [ -z "$JAVA_HOME" ] && _RUNJAVA=`java` +CLASSPATH="$COLLECTOR_HOME/config:$CLASSPATH" +for i in "$COLLECTOR_HOME"/libs/*.jar +do + echo $i + CLASSPATH="$i:$CLASSPATH" +done + +echo $CLASSPATH + echo "Starting collector...." -eval exec "\"$_RUNJAVA\" ${COLLECTOR_RUNTIME_OPTIONS} -jar ${COLLECTOR_HOME}/libs/skywalking-collector.jar \ +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 diff --git a/skywalking-collector/skywalking-collector-worker/pom.xml b/skywalking-collector/skywalking-collector-worker/pom.xml index af4904ab144863a2bf518f78b6843e21c32ad34a..c336b6883400dbc821c8dc85bcada908e9cefdc5 100644 --- a/skywalking-collector/skywalking-collector-worker/pom.xml +++ b/skywalking-collector/skywalking-collector-worker/pom.xml @@ -75,12 +75,7 @@ *.config - false - - config/ - - true ${main.class} 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