From 1a103d1e8c956e8981aa415bde1710a3f0063011 Mon Sep 17 00:00:00 2001
From: Yuhao Bi <byh0831@gmail.com>
Date: Sun, 27 Jan 2019 21:59:47 +0800
Subject: [PATCH] Make DubboAppender extends from FileAppender

Tweak unit test log location
---
 .travis.yml                                          |  3 +++
 dubbo-cluster/src/test/resources/log4j.xml           |  1 +
 .../org/apache/dubbo/common/utils/DubboAppender.java |  9 +++++++--
 dubbo-common/src/test/resources/log4j.xml            |  1 +
 .../src/test/resources/log4j.xml                     |  7 +------
 .../src/test/resources/log4j.xml                     |  1 +
 dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j.xml |  1 +
 .../dubbo-rpc-dubbo/src/test/resources/log4j.xml     | 12 ++----------
 .../src/test/resources/log4j.xml                     |  1 +
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 32306778b30e..e3f3350628cc 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 df9d68a0fabc..eb0c9f105de2 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 da3968e9f6e1..f1079880c5f7 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,13 +16,18 @@
  */
 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 {
+
+    public DubboAppender() {
+        super();
+        setFile("dubbo.log");
+    }
 
     public static boolean available = false;
 
diff --git a/dubbo-common/src/test/resources/log4j.xml b/dubbo-common/src/test/resources/log4j.xml
index f5da181b5e3d..260e5c9d85ff 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 c8d6d8c5b581..91905fd10b23 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 acb85098b271..fc40926e12ac 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 f041044f0816..e0eda90175db 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 3c5d2ba218ed..09dba05e6cc5 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 f71c5535c148..3c5e376bebd2 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"/>