This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 7826f27 [Dubbo-3361] Make DubboAppender extends from FileAppender
(#3383)
7826f27 is described below
commit 7826f27af5c02a443ca7a9ceba3f7f05bccb8915
Author: Yuhao Bi <[email protected]>
AuthorDate: Wed Jan 30 22:24:02 2019 +0800
[Dubbo-3361] Make DubboAppender extends from FileAppender (#3383)
---
.travis.yml | 3 +++
dubbo-cluster/src/test/resources/log4j.xml | 1 +
.../java/org/apache/dubbo/common/utils/DubboAppender.java | 13 ++++++++++---
dubbo-common/src/test/resources/log4j.xml | 1 +
.../dubbo-registry-default/src/test/resources/log4j.xml | 7 +------
.../dubbo-remoting-netty/src/test/resources/log4j.xml | 1 +
dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j.xml | 1 +
dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml | 12 ++----------
.../dubbo-serialization-test/src/test/resources/log4j.xml | 1 +
9 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 3230677..e3f3350 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,3 +16,6 @@ script:
after_success:
- bash <(curl -s https://codecov.io/bash)
+
+after_failure:
+ - if [ -f dubbo.log ]; then echo "------TAIL of dubbo.log------"; tail -n
1000 dubbo.log; echo "------END of dubbo.log------"; fi
diff --git a/dubbo-cluster/src/test/resources/log4j.xml
b/dubbo-cluster/src/test/resources/log4j.xml
index df9d68a..eb0c9f1 100644
--- a/dubbo-cluster/src/test/resources/log4j.xml
+++ b/dubbo-cluster/src/test/resources/log4j.xml
@@ -18,6 +18,7 @@
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";
debug="false">
<appender name="DUBBO" class="org.apache.dubbo.common.utils.DubboAppender">
+ <param name="File" value="../dubbo.log"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS
z}] %t %5p %c{2}: %m%n"/>
</layout>
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/DubboAppender.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/DubboAppender.java
index da3968e..e2b1940 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/DubboAppender.java
+++
b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/DubboAppender.java
@@ -16,17 +16,24 @@
*/
package org.apache.dubbo.common.utils;
-import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.FileAppender;
import org.apache.log4j.spi.LoggingEvent;
import java.util.ArrayList;
import java.util.List;
-public class DubboAppender extends ConsoleAppender {
+public class DubboAppender extends FileAppender {
+
+ private static final String DEFAULT_FILE_NAME = "dubbo.log";
+
+ public DubboAppender() {
+ super();
+ setFile(DEFAULT_FILE_NAME);
+ }
public static boolean available = false;
- public static List<Log> logList = new ArrayList<Log>();
+ public static List<Log> logList = new ArrayList<>();
public static void doStart() {
available = true;
diff --git a/dubbo-common/src/test/resources/log4j.xml
b/dubbo-common/src/test/resources/log4j.xml
index f5da181..260e5c9 100644
--- a/dubbo-common/src/test/resources/log4j.xml
+++ b/dubbo-common/src/test/resources/log4j.xml
@@ -20,6 +20,7 @@
<!-- 以下是appender的定义 -->
<!-- =====================================================================
-->
<appender name="dubbo" class="org.apache.dubbo.common.utils.DubboAppender">
+ <param name="File" value="../dubbo.log"/>
<param name="encoding" value="GBK"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %p [%c:%M] - %m%n"/>
diff --git a/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml
b/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml
index c8d6d8c..91905fd 100644
--- a/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml
+++ b/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml
@@ -21,6 +21,7 @@
<!-- The following is the definition of appender -->
<!-- =====================================================================
-->
<appender name="dubbo" class="org.apache.dubbo.common.utils.DubboAppender">
+ <param name="File" value="../../dubbo.log"/>
<param name="encoding" value="GBK"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %p [%c:%M] - %m%n"/>
@@ -30,14 +31,8 @@
<param name="LevelMax" value="DEBUG" />
</filter> -->
</appender>
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS
z}] %5p %c{2}: %m%n"/>
- </layout>
- </appender>
<root>
<level value="INFO"/>
<appender-ref ref="dubbo"/>
- <appender-ref ref="CONSOLE"/>
</root>
</log4j:configuration>
\ No newline at end of file
diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/resources/log4j.xml
b/dubbo-remoting/dubbo-remoting-netty/src/test/resources/log4j.xml
index acb8509..fc40926 100644
--- a/dubbo-remoting/dubbo-remoting-netty/src/test/resources/log4j.xml
+++ b/dubbo-remoting/dubbo-remoting-netty/src/test/resources/log4j.xml
@@ -21,6 +21,7 @@
<!-- 以下是appender的定义 -->
<!-- =====================================================================
-->
<appender name="dubbo" class="org.apache.dubbo.common.utils.DubboAppender">
+ <param name="File" value="../../dubbo.log"/>
<param name="encoding" value="GBK"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %p [%c:%M] - %m%n"/>
diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j.xml
b/dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j.xml
index f041044..e0eda90 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j.xml
+++ b/dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j.xml
@@ -21,6 +21,7 @@
<!-- 以下是appender的定义 -->
<!-- =====================================================================
-->
<appender name="dubbo" class="org.apache.dubbo.common.utils.DubboAppender">
+ <param name="File" value="../../dubbo.log"/>
<param name="encoding" value="GBK"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %p [%c:%M] - %m%n"/>
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml
index 3c5d2ba..09dba05 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml
@@ -21,6 +21,7 @@
<!-- 以下是appender的定义 -->
<!-- =====================================================================
-->
<appender name="dubbo" class="org.apache.dubbo.common.utils.DubboAppender">
+ <param name="File" value="../../dubbo.log"/>
<param name="encoding" value="GBK"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %p [%c:%M] - %m%n"/>
@@ -30,17 +31,8 @@
<param name="LevelMax" value="DEBUG" />
</filter> -->
</appender>
- <appender name="FILE" class="org.apache.log4j.FileAppender">
- <param name="File" value="dubbo.log"/>
- <layout class="org.apache.log4j.PatternLayout">
- <!-- <param name="ConversionPattern" value="[%t %d{dd/MM/yy
HH:mm:ss:SSS
- z}] %5p %c{2}: %L %m%n" /> -->
- <param name="ConversionPattern" value="[%t %l %d{dd/MM/yy
HH:mm:ss:SSS z}] %5p %m %n"/>
- </layout>
- </appender>
<root>
<level value="INFO"/>
<appender-ref ref="dubbo"/>
- <appender-ref ref="FILE"/>
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
diff --git
a/dubbo-serialization/dubbo-serialization-test/src/test/resources/log4j.xml
b/dubbo-serialization/dubbo-serialization-test/src/test/resources/log4j.xml
index f71c553..3c5e376 100644
--- a/dubbo-serialization/dubbo-serialization-test/src/test/resources/log4j.xml
+++ b/dubbo-serialization/dubbo-serialization-test/src/test/resources/log4j.xml
@@ -18,6 +18,7 @@
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
<appender name="dubbo" class="org.apache.dubbo.common.utils.DubboAppender">
+ <param name="File" value="../../dubbo.log"/>
<param name="encoding" value="GBK"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %p [%c:%M] - %m%n"/>
