From f9e7298a7d72d660ed6efa966ce0242c294e12fc Mon Sep 17 00:00:00 2001
From: ascrutae <nzt48.xin@gmail.com>
Date: Wed, 13 Sep 2017 23:32:20 +0800
Subject: [PATCH] change log component.

---
 .../bin/collector-service.bat                 | 13 +++++----
 .../bin/collector-service.sh                  |  6 ++---
 .../src/main/assembly/assembly.xml            |  4 +--
 .../src/main/resources/log4j2.xml             | 26 ++++++++++++++++++
 .../src/main/resources/logback.xml            | 27 -------------------
 apm-collector/pom.xml                         | 18 ++++++++-----
 6 files changed, 51 insertions(+), 43 deletions(-)
 create mode 100644 apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
 delete mode 100644 apm-collector/apm-collector-boot/src/main/resources/logback.xml

diff --git a/apm-collector/apm-collector-boot/bin/collector-service.bat b/apm-collector/apm-collector-boot/bin/collector-service.bat
index d42686a9d9..eb58f7ebcc 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 624126659e..4babe32e6d 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 e015509075..85ae375455 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 @@
             <directory>src/main/resources</directory>
             <includes>
                 <include>application.yml</include>
-                <include>logback.xml</include>
+                <include>log4j2.xml</include>
             </includes>
             <outputDirectory>/config</outputDirectory>
         </fileSet>
@@ -39,4 +39,4 @@
             </includes>
         </fileSet>
     </fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
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 0000000000..c76236792b
--- /dev/null
+++ b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="error">
+    <Properties>
+        <Property name="log-path">${sys:collector.logDir}</Property>
+    </Properties>
+    <Appenders>
+        <RollingFile name="RollingFile" fileName="${log-path}/skywalking-collector.log"
+                     filePattern="${log-path}/skywalking-web-server-%d{yyyy-MM-dd}-%i.log">
+            <PatternLayout>
+                <pattern>%d - %c -%-4r [%t] %-5p %x - %m%n</pattern>
+            </PatternLayout>
+            <Policies>
+                <SizeBasedTriggeringPolicy size="102400KB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="30"/>
+        </RollingFile>
+    </Appenders>
+    <Loggers>
+        <logger name="org.eclipse.jetty" level="INFO"/>
+        <logger name="org.apache.zookeeper" level="INFO"/>
+        <logger name="org.skywalking.apm.collector.agentstream.worker.storage.PersistenceTimer" level="INFO"/>
+        <Root level="info">
+            <AppenderRef ref="RollingFile"/>
+        </Root>
+    </Loggers>
+</Configuration>
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 cc5427d884..0000000000
--- a/apm-collector/apm-collector-boot/src/main/resources/logback.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <property name="LOG_PATH" value="../logs" />
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-        </layout>
-    </appender>
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${LOG_PATH}/skywalking-server-log4j2.log</file>
-        <append>true</append>
-        <immediateFlush>true</immediateFlush>
-        <encoder>
-            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.skywalking.apm.collector.agentstream.worker.storage.PersistenceTimer" level="INFO"/>
-    <logger name="org.eclipse.jetty" level="INFO"/>
-    <logger name="org.apache.zookeeper" level="INFO"/>
-
-    <root level="info">
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="FILE"/>
-    </root>
-</configuration>
\ No newline at end of file
diff --git a/apm-collector/pom.xml b/apm-collector/pom.xml
index ab4f4445cb..f9e5eaa397 100644
--- a/apm-collector/pom.xml
+++ b/apm-collector/pom.xml
@@ -35,11 +35,6 @@
             <artifactId>slf4j-api</artifactId>
             <version>1.7.25</version>
         </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
@@ -48,12 +43,23 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.8.2</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>22.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.9.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 </project>
-- 
GitLab