diff --git a/apm-collector/apm-collector-boot/bin/collector-service.bat b/apm-collector/apm-collector-boot/bin/collector-service.bat
index d42686a9d923464f5eae5ed5ad3c13ceaaf7579d..eb58f7ebcc68eb25de0f004ddd342276f92048ef 100755
--- a/apm-collector/apm-collector-boot/bin/collector-service.bat
+++ b/apm-collector/apm-collector-boot/bin/collector-service.bat
@@ -3,18 +3,21 @@
setlocal
set COLLECOTR_PROCESS_TITLE=Skywalking-Collector
set COLLECTOR_BASE_PATH=%~dp0%..
-set COLLECTOR_RUNTIME_OPTIONS="-Xms256M -Xmx512M"
+set COLLECTOR_RUNTIME_OPTIONS="-Xms256M -Xmx512M -Dcollector.logDir=%COLLECTOR_BASE_PATH%\logs"
set CLASSPATH=%COLLECTOR_BASE_PATH%\config;
SET CLASSPATH=%COLLECTOR_BASE_PATH%\libs\*;%CLASSPATH%
-if ""%JAVA_HOME%"" == """" (
+if defined JAVA_HOME (
+ set _EXECJAVA="%JAVA_HOME:"=%"\bin\java
+)
+
+if not defined JAVA_HOME (
+ echo "JAVA_HOME not set."
set _EXECJAVA=java
-) else (
- set _EXECJAVA="%JAVA_HOME%"/bin/java
)
start /MIN "%COLLECOTR_PROCESS_TITLE%" %_EXECJAVA% "%COLLECTOR_RUNTIME_OPTIONS%" -cp "%CLASSPATH%" org.skywalking.apm.collector.boot.CollectorBootStartUp &
echo Collector started successfully!
-endlocal
\ No newline at end of file
+endlocal
diff --git a/apm-collector/apm-collector-boot/bin/collector-service.sh b/apm-collector/apm-collector-boot/bin/collector-service.sh
index 624126659e8a661ae4c5ca3c7c6c77cfbc38cf67..4babe32e6dd879eaaba8c826be6fe74df645da0d 100755
--- a/apm-collector/apm-collector-boot/bin/collector-service.sh
+++ b/apm-collector/apm-collector-boot/bin/collector-service.sh
@@ -19,9 +19,9 @@ for i in "$COLLECTOR_HOME"/libs/*.jar
do
CLASSPATH="$i:$CLASSPATH"
done
-
+COLLECTOR_OPTIONS=" -Dcollector.logDir=$COLLECTOR_LOGS_DIR"
echo "Starting collector...."
-eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} -classpath $CLASSPATH org.skywalking.apm.collector.boot.CollectorBootStartUp \
+eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} ${COLLECTOR_OPTIONS} -classpath $CLASSPATH org.skywalking.apm.collector.boot.CollectorBootStartUp \
2>${COLLECTOR_LOGS_DIR}/collector.log 1> /dev/null &"
retval=$?
@@ -34,4 +34,4 @@ if ! ps -p ${pid} > /dev/null ; then
echo ${FAIL_MSG}
exit 1
fi
-echo ${SUCCESS_MSG}
\ No newline at end of file
+echo ${SUCCESS_MSG}
diff --git a/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml b/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
index e0155090755ba5c14fc6d56ba9ac6f396c9fba0b..85ae37545558cbed7b7373c568424f3a60595bc6 100644
--- a/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
+++ b/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
@@ -27,7 +27,7 @@
src/main/resources
application.yml
- logback.xml
+ log4j2.xml
/config
@@ -39,4 +39,4 @@
-
\ No newline at end of file
+
diff --git a/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c76236792b3bcb4da4bd64246445cc3a04053bba
--- /dev/null
+++ b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
@@ -0,0 +1,26 @@
+
+
+
+ ${sys:collector.logDir}
+
+
+
+
+ %d - %c -%-4r [%t] %-5p %x - %m%n
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apm-collector/apm-collector-boot/src/main/resources/logback.xml b/apm-collector/apm-collector-boot/src/main/resources/logback.xml
deleted file mode 100644
index cc5427d8844361940b69cc8333c58e0286c6e385..0000000000000000000000000000000000000000
--- a/apm-collector/apm-collector-boot/src/main/resources/logback.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-
-
-
- ${LOG_PATH}/skywalking-server-log4j2.log
- true
- true
-
- %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml
index ab4f4445cba38fb3383d92d9e6050c9cadc5d476..f9e5eaa397cf6c46ee009c4679a89b92d7ddf3da 100644
--- a/apm-collector/pom.xml
+++ b/apm-collector/pom.xml
@@ -35,11 +35,6 @@
slf4j-api
1.7.25
-
- ch.qos.logback
- logback-classic
- 1.2.3
-
org.slf4j
log4j-over-slf4j
@@ -48,12 +43,23 @@
org.apache.logging.log4j
log4j-core
- 2.8.2
+ 2.9.0
com.google.guava
guava
22.0
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+ 2.9.0
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
+