From c37f560a37affd2b1d4e055122826fc9781ec923 Mon Sep 17 00:00:00 2001
From: imuge <liuyuanmu@jd.com>
Date: Tue, 5 Jan 2021 10:41:43 +0800
Subject: [PATCH] update log configurations

---
 .../src/main/resources/config/log4j2-gw.xml           | 11 ++++++-----
 .../src/main/resources/scripts/startup.sh             |  8 ++++----
 .../src/main/resources/config/log4j2-peer.xml         | 11 ++++++-----
 .../src/main/resources/scripts/peer-startup.sh        |  5 ++++-
 4 files changed, 20 insertions(+), 15 deletions(-)

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 437bc6f0..7a9914af 100644
--- a/deploy/deploy-gateway/src/main/resources/config/log4j2-gw.xml
+++ b/deploy/deploy-gateway/src/main/resources/config/log4j2-gw.xml
@@ -2,7 +2,7 @@
 <configuration status="WARN" monitorInterval="60">
     <appenders>
         <console name="Console" target="SYSTEM_OUT">
-            <ThresholdFilter level="all" onMatch="ACCEPT" onMismatch="DENY"/>
+            <ThresholdFilter level="fatal" 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"
@@ -10,9 +10,9 @@
             <PatternLayout pattern="[%date{yyyy-MM-dd HH:mm:ss:SSS}] [%thread] [%p] - %l - %m%n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy/>
-                <SizeBasedTriggeringPolicy size="250 MB"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>
-            <DefaultRolloverStrategy max="10"/>
+            <DefaultRolloverStrategy max="100"/>
         </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">
@@ -26,9 +26,10 @@
     </appenders>
 
     <loggers>
-        <logger name="org.springframework" level="ERROR"></logger>
+        <logger name="org.springframework" level="error"></logger>
+        <logger name="bftsmart" level="error"></logger>
         <!--修改此处，以变更日志等级-->
-        <root level="all">
+        <root level="info">
             <appender-ref ref="Console"/>
             <appender-ref ref="GWRolling"/>
             <appender-ref ref="GWRollingError"/>
diff --git a/deploy/deploy-gateway/src/main/resources/scripts/startup.sh b/deploy/deploy-gateway/src/main/resources/scripts/startup.sh
index 2db26ec4..a38f2f62 100644
--- a/deploy/deploy-gateway/src/main/resources/scripts/startup.sh
+++ b/deploy/deploy-gateway/src/main/resources/scripts/startup.sh
@@ -19,8 +19,8 @@ APP_HOME=$(cd `dirname $0`;cd ../; pwd)
 #Lib目录
 APP_LIB_PATH=$APP_HOME/lib
 
-#节点输出日志路径
-LOG_OUT=$APP_HOME/logs
+#nohup输出日志路径
+LOG_OUT=$APP_HOME/bin/gw.out
 
 #获取Peer节点的启动Jar包
 APP_JAR=$(ls $APP_LIB_PATH | grep $APP_JAR_PREFIX)
@@ -32,7 +32,7 @@ CONFIG_PATH=$APP_HOME/config
 GATEWAY_CONFIG=$CONFIG_PATH/gateway.conf
 
 #定义程序启动的参数
-JAVA_OPTS="-jar -server -Xms1024m -Xmx1024m  -Djdchain.log=$LOG_OUT -Dlogging.config=file:$APP_HOME/config/log4j2-gw.xml"
+JAVA_OPTS="-jar -server -Xms1024m -Xmx1024m  -Djdchain.log=$APP_HOME/logs -Dlogging.config=file:$APP_HOME/config/log4j2-gw.xml"
 
 #APP具体相关命令
 APP_CMD=$APP_LIB_PATH/$APP_JAR" -c "$GATEWAY_CONFIG
@@ -90,7 +90,7 @@ if [[ $psid -ne 0 ]]; then
   echo "================================"
 else
   echo "Starting Gateway ......"
-  nohup $JAVA_BIN $JAVA_OPTS $APP_CMD $* &
+  nohup $JAVA_BIN $JAVA_OPTS $APP_CMD $* >$LOG_OUT 2>&1 &
   JAVA_CMD="$JAVA_BIN $JAVA_OPTS $APP_CMD $*"
   sleep 1
   checkpid
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 e5ab655a..ad218870 100644
--- a/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml
+++ b/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml
@@ -2,7 +2,7 @@
 <configuration status="WARN" monitorInterval="60">
     <appenders>
         <console name="Console" target="SYSTEM_OUT">
-            <ThresholdFilter level="all" onMatch="ACCEPT" onMismatch="DENY"/>
+            <ThresholdFilter level="fatal" 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"
@@ -10,9 +10,9 @@
             <PatternLayout pattern="[%date{yyyy-MM-dd HH:mm:ss:SSS}] [%thread] [%p] - %l - %m%n"/>
             <Policies>
                 <TimeBasedTriggeringPolicy/>
-                <SizeBasedTriggeringPolicy size="250 MB"/>
+                <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>
-            <DefaultRolloverStrategy max="10"/>
+            <DefaultRolloverStrategy max="100"/>
         </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">
@@ -26,9 +26,10 @@
     </appenders>
 
     <loggers>
-        <logger name="org.springframework" level="ERROR"></logger>
+        <logger name="org.springframework" level="error"></logger>
+        <logger name="bftsmart" level="error"></logger>
         <!--修改此处，以变更日志等级-->
-        <root level="all">
+        <root level="info">
             <appender-ref ref="Console"/>
             <appender-ref ref="PeerRolling"/>
             <appender-ref ref="PeerRollingError"/>
diff --git a/deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh b/deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh
index 1823ad19..e54c7d38 100644
--- a/deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh
+++ b/deploy/deploy-peer/src/main/resources/scripts/peer-startup.sh
@@ -30,6 +30,9 @@ APP_HOME=$(cd `dirname $0`;cd ../; pwd)
 #System目录
 APP_SYSTEM_PATH=$APP_HOME/system
 
+#nohup输出日志路径
+LOG_OUT=$APP_HOME/bin/peer.out
+
 #获取Peer节点的启动Jar包
 APP_JAR=$(ls $APP_SYSTEM_PATH | grep $APP_JAR_PREFIX)
 
@@ -101,7 +104,7 @@ if [[ $psid -ne 0 ]]; then
   echo "================================"
 else
   echo "Starting Peer ......"
-  nohup $JAVA_BIN $JAVA_OPTS $APP_CMD $* &
+  nohup $JAVA_BIN $JAVA_OPTS $APP_CMD $* >$LOG_OUT 2>&1 &
   JAVA_CMD="$JAVA_BIN $JAVA_OPTS $APP_CMD $*"
   sleep 1
   checkpid