From ab7157e8a6cb400088fd0a1ef12a2d0c74a23b3a Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Fri, 8 Apr 2016 16:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/log4j.xml              | 29 +++++-------
 .../src/main/resources/log4j2.xml             | 45 ++++++++++---------
 2 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/skywalking-server/src/main/resources/log4j.xml b/skywalking-server/src/main/resources/log4j.xml
index 22859c554..d2cef7b5f 100644
--- a/skywalking-server/src/main/resources/log4j.xml
+++ b/skywalking-server/src/main/resources/log4j.xml
@@ -1,26 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-    <appender name="consoleAppend" class="org.apache.log4j.ConsoleAppender" >
+<log4j:configuration>
+    <appender name="rollingFile"
+              class="org.apache.log4j.RollingFileAppender">
+        <param name="File" value="../log/skywalking-server-log4j.log"/>
+        <param name="ImmediateFlush" value="true"/>
+        <param name="Threshold" value="INFO"></param>
+        <param name="Append" value="true"></param>
+        <param name="MaxFileSize" value="10240KB"></param>
+        <param name="MaxBackupIndex" value="10"></param>
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-d{yyyy-MM-dd HH:mm:ss} [%5p][%t][%c{1}]-[%M] %m%n" />
-        </layout>
-    </appender>
-
-    <appender name="bizAppend" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="../log/skywalking-server.log" />
-        <param name="Append" value="true" />
-        <param name="DatePattern" value="'.'yyyy-MM-dd-HH'.log'" />
-        <param name="encoding" value="utf-8"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="[date:%d{yyyy-MM-dd HH:mm:ss}] %m%n" />
+            <param name="ConversionPattern" value="%d - %c -%-4r [%t] %-5p %x - %m%n"></param>
         </layout>
     </appender>
 
     <root>
         <priority value="INFO" />
-        <appender-ref ref="bizAppend" />
+        <appender-ref ref="rollingFile" />
     </root>
-
 </log4j:configuration>
\ No newline at end of file
diff --git a/skywalking-server/src/main/resources/log4j2.xml b/skywalking-server/src/main/resources/log4j2.xml
index 0da420637..97704498b 100644
--- a/skywalking-server/src/main/resources/log4j2.xml
+++ b/skywalking-server/src/main/resources/log4j2.xml
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="debug">
-    <appender name="consoleAppend" class="org.apache.log4j.ConsoleAppender" >
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%-d{yyyy-MM-dd HH:mm:ss} [%5p][%t][%c{1}]-[%M] %m%n" />
-        </layout>
-    </appender>
-
-    <appender name="bizAppend" class="org.apache.log4j.DailyRollingFileAppender">
-        <param name="File" value="../log/skywalking-server.log" />
-        <param name="Append" value="true" />
-        <param name="DatePattern" value="'.'yyyy-MM-dd-HH'.log'" />
-        <param name="encoding" value="utf-8"/>
-        <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="[date:%d{yyyy-MM-dd HH:mm:ss}] %m%n" />
-        </layout>
-    </appender>
-
-    <root>
-        <priority value="INFO" />
-        <appender-ref ref="bizAppend" />
-    </root>
+<Configuration status="DEBUG">
+    <Properties>
+        <Property name="log-path">../</Property>
+    </Properties>
+    <Appenders>
+        <RollingFile name="RollingFile" fileName="${log-path}/skywalking-server-log4j2.log"
+                     filePattern="${log-path}/skywalking-server-log4j2-%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="root" level="INFO" additivity="false">
+            <appender-ref ref="RollingFile" level="INFO"/>
+        </Logger>
+        <Root level="INFO" additivity="false">
+            <AppenderRef ref="RollingFile"/>
+        </Root>
+    </Loggers>
 </Configuration>
\ No newline at end of file