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 216e750 Fix log4j pattern layout (#2802)
216e750 is described below
commit 216e75063002ca3d8c45e441c3f3c353aa21a5a4
Author: Lonre Wang <[email protected]>
AuthorDate: Thu Dec 6 22:37:00 2018 +0800
Fix log4j pattern layout (#2802)
---
dubbo-cluster/src/test/resources/log4j.xml | 2 +-
dubbo-config/dubbo-config-api/src/test/resources/log4j.xml | 2 +-
dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml | 2 +-
dubbo-container/dubbo-container-spring/src/test/resources/log4j.xml | 2 +-
dubbo-demo/dubbo-demo-consumer/src/main/resources/log4j.properties | 2 +-
dubbo-demo/dubbo-demo-provider/src/main/resources/log4j.properties | 2 +-
dubbo-registry/dubbo-registry-api/src/test/resources/log4j.xml | 2 +-
dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml | 2 +-
dubbo-remoting/dubbo-remoting-api/src/test/resources/log4j.xml | 2 +-
dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml | 4 ++--
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dubbo-cluster/src/test/resources/log4j.xml
b/dubbo-cluster/src/test/resources/log4j.xml
index 9b7df21..df9d68a 100644
--- a/dubbo-cluster/src/test/resources/log4j.xml
+++ b/dubbo-cluster/src/test/resources/log4j.xml
@@ -19,7 +19,7 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";
debug="false">
<appender name="DUBBO" class="org.apache.dubbo.common.utils.DubboAppender">
<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"/>
+ <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS
z}] %t %5p %c{2}: %m%n"/>
</layout>
</appender>
<root>
diff --git a/dubbo-config/dubbo-config-api/src/test/resources/log4j.xml
b/dubbo-config/dubbo-config-api/src/test/resources/log4j.xml
index 4a9fe2e..5007dd1 100644
--- a/dubbo-config/dubbo-config-api/src/test/resources/log4j.xml
+++ b/dubbo-config/dubbo-config-api/src/test/resources/log4j.xml
@@ -18,7 +18,7 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";
debug="false">
<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}] %t %5p %c{2}: %m%n"/>
+ <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS
z}] %t %5p %c{2}: %m%n"/>
</layout>
</appender>
<root>
diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml
b/dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml
index 63be601..bbb7f03 100644
--- a/dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml
+++ b/dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml
@@ -19,7 +19,7 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";
debug="false">
<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}] %t %5p %c{2}: %m%n"/>
+ <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS
z}] %t %5p %c{2}: %m%n"/>
</layout>
</appender>
diff --git
a/dubbo-container/dubbo-container-spring/src/test/resources/log4j.xml
b/dubbo-container/dubbo-container-spring/src/test/resources/log4j.xml
index 18f2b5f..f037070 100644
--- a/dubbo-container/dubbo-container-spring/src/test/resources/log4j.xml
+++ b/dubbo-container/dubbo-container-spring/src/test/resources/log4j.xml
@@ -19,7 +19,7 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";
debug="false">
<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}] %t %5p %c{2}: %m%n"/>
+ <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS
z}] %t %5p %c{2}: %m%n"/>
</layout>
</appender>
<root>
diff --git a/dubbo-demo/dubbo-demo-consumer/src/main/resources/log4j.properties
b/dubbo-demo/dubbo-demo-consumer/src/main/resources/log4j.properties
index 63f4e27..2424381 100644
--- a/dubbo-demo/dubbo-demo-consumer/src/main/resources/log4j.properties
+++ b/dubbo-demo/dubbo-demo-consumer/src/main/resources/log4j.properties
@@ -4,4 +4,4 @@ log4j.rootLogger=info, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy hh:mm:ss:sss z}]
%t %5p %c{2}: %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy HH:mm:ss:SSS z}]
%t %5p %c{2}: %m%n
\ No newline at end of file
diff --git a/dubbo-demo/dubbo-demo-provider/src/main/resources/log4j.properties
b/dubbo-demo/dubbo-demo-provider/src/main/resources/log4j.properties
index d956846..15a0900 100644
--- a/dubbo-demo/dubbo-demo-provider/src/main/resources/log4j.properties
+++ b/dubbo-demo/dubbo-demo-provider/src/main/resources/log4j.properties
@@ -4,4 +4,4 @@ log4j.rootLogger=info, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy hh:mm:ss:sss z}]
%t %5p %c{2}: %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%d{dd/MM/yy HH:mm:ss:SSS z}]
%t %5p %c{2}: %m%n
\ No newline at end of file
diff --git a/dubbo-registry/dubbo-registry-api/src/test/resources/log4j.xml
b/dubbo-registry/dubbo-registry-api/src/test/resources/log4j.xml
index ff12d5b..f5c44f1 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/resources/log4j.xml
+++ b/dubbo-registry/dubbo-registry-api/src/test/resources/log4j.xml
@@ -19,7 +19,7 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";
debug="false">
<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"/>
+ <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS
z}] %5p %c{2}: %m%n"/>
</layout>
</appender>
<root>
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 9e12990..c8d6d8c 100644
--- a/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml
+++ b/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml
@@ -32,7 +32,7 @@
</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"/>
+ <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS
z}] %5p %c{2}: %m%n"/>
</layout>
</appender>
<root>
diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/resources/log4j.xml
b/dubbo-remoting/dubbo-remoting-api/src/test/resources/log4j.xml
index b91d2d6..927212a 100644
--- a/dubbo-remoting/dubbo-remoting-api/src/test/resources/log4j.xml
+++ b/dubbo-remoting/dubbo-remoting-api/src/test/resources/log4j.xml
@@ -19,7 +19,7 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";
debug="false">
<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}] %t %5p %c{2}: %m%n"/>
+ <param name="ConversionPattern" value="[%d{dd/MM/yy HH:mm:ss:SSS
z}] %t %5p %c{2}: %m%n"/>
</layout>
</appender>
<root>
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 0af90b6..3c5d2ba 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml
@@ -33,9 +33,9 @@
<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
+ <!-- <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"/>
+ <param name="ConversionPattern" value="[%t %l %d{dd/MM/yy
HH:mm:ss:SSS z}] %5p %m %n"/>
</layout>
</appender>
<root>
