From ba4b2c418813e176a5323427d33bf57a37e28174 Mon Sep 17 00:00:00 2001
From: imuge <liuyuanmu@jd.com>
Date: Mon, 4 Jan 2021 18:22:58 +0800
Subject: [PATCH] add error rolling

---
 core                                               |  2 +-
 .../src/main/resources/config/log4j2-gw.xml        | 14 ++++++++++++--
 .../src/main/resources/config/log4j2-peer.xml      | 14 ++++++++++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/core b/core
index bfbb6267..e8fadcf5 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit bfbb6267d14b8b59a7d0b5593bc4b5958dbb3680
+Subproject commit e8fadcf5399e4005d1089838d556e5997e04d036
diff --git a/deploy/deploy-gateway/src/main/resources/config/log4j2-gw.xml b/deploy/deploy-gateway/src/main/resources/config/log4j2-gw.xml
index 8bffe83a..437bc6f0 100644
--- a/deploy/deploy-gateway/src/main/resources/config/log4j2-gw.xml
+++ b/deploy/deploy-gateway/src/main/resources/config/log4j2-gw.xml
@@ -2,18 +2,27 @@
 <configuration status="WARN" monitorInterval="60">
     <appenders>
         <console name="Console" target="SYSTEM_OUT">
-            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <ThresholdFilter level="all" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
         </console>
         <RollingFile name="GWRolling" fileName="${sys:jdchain.log}/gw.log"
                      filePattern="${sys:jdchain.log}/$${date:yyyy-MM}/gw-%d{yyyy-MM-dd}-%i.log">
-            <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
+            <PatternLayout pattern="[%date{yyyy-MM-dd HH:mm:ss:SSS}] [%thread] [%p] - %l - %m%n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy/>
                 <SizeBasedTriggeringPolicy size="250 MB"/>
             </Policies>
             <DefaultRolloverStrategy max="10"/>
         </RollingFile>
+        <RollingFile name="GWRollingError" fileName="${sys:jdchain.log}/gw.error.log"
+                     filePattern="${sys:jdchain.log}/$${date:yyyy-MM}/gw.error-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="[%date{yyyy-MM-dd HH:mm:ss:SSS}] [%thread] [%p] - %l - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
     </appenders>
 
     <loggers>
@@ -22,6 +31,7 @@
         <root level="all">
             <appender-ref ref="Console"/>
             <appender-ref ref="GWRolling"/>
+            <appender-ref ref="GWRollingError"/>
         </root>
     </loggers>
 </configuration>
\ No newline at end of file
diff --git a/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml b/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml
index 2d136e0b..e5ab655a 100644
--- a/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml
+++ b/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml
@@ -2,18 +2,27 @@
 <configuration status="WARN" monitorInterval="60">
     <appenders>
         <console name="Console" target="SYSTEM_OUT">
-            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <ThresholdFilter level="all" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
         </console>
         <RollingFile name="PeerRolling" fileName="${sys:jdchain.log}/peer.log"
                      filePattern="${sys:jdchain.log}/$${date:yyyy-MM}/peer-%d{yyyy-MM-dd}-%i.log">
-            <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
+            <PatternLayout pattern="[%date{yyyy-MM-dd HH:mm:ss:SSS}] [%thread] [%p] - %l - %m%n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy/>
                 <SizeBasedTriggeringPolicy size="250 MB"/>
             </Policies>
             <DefaultRolloverStrategy max="10"/>
         </RollingFile>
+        <RollingFile name="PeerRollingError" fileName="${sys:jdchain.log}/peer.error.log"
+                     filePattern="${sys:jdchain.log}/$${date:yyyy-MM}/peer.error-%d{yyyy-MM-dd}-%i.log">
+            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="[%date{yyyy-MM-dd HH:mm:ss:SSS}] [%thread] [%p] - %l - %m%n"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
+            </Policies>
+        </RollingFile>
     </appenders>
 
     <loggers>
@@ -22,6 +31,7 @@
         <root level="all">
             <appender-ref ref="Console"/>
             <appender-ref ref="PeerRolling"/>
+            <appender-ref ref="PeerRollingError"/>
         </root>
     </loggers>
 </configuration>
\ No newline at end of file