From a91da3d5a1b08d3cb32ef5df40977a82c9a83c29 Mon Sep 17 00:00:00 2001
From: shaozhuguang <shaozhuguang@jd.com>
Date: Sat, 21 Sep 2019 10:14:41 +0800
Subject: [PATCH] Change Peer startup shell !

---
 .../src/main/resources/scripts/startup.sh          |  2 +-
 .../src/main/resources/scripts/ledger-init.sh      |  2 +-
 .../src/main/resources/scripts/manager-startup.sh  |  2 +-
 .../src/main/resources/scripts/peer-startup.sh     |  2 +-
 source/gateway/src/main/resources/log4j2.xml       | 14 +++++++-------
 .../main/java/com/jd/blockchain/ump/UmpBooter.java |  1 +
 .../src/main/resources/log4j2-jump.xml             |  8 ++++----
 .../com/jd/blockchain/ump/model/UmpConstant.java   |  2 +-
 .../ump/service/LedgerServiceHandler.java          |  2 +-
 source/peer/src/main/resources/log4j2.xml          | 14 +++++++-------
 .../src/main/resources/log4j2-init.xml             | 14 +++++++-------
 11 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/source/deployment/deployment-gateway/src/main/resources/scripts/startup.sh b/source/deployment/deployment-gateway/src/main/resources/scripts/startup.sh
index 44a1a528..915c33f3 100644
--- a/source/deployment/deployment-gateway/src/main/resources/scripts/startup.sh
+++ b/source/deployment/deployment-gateway/src/main/resources/scripts/startup.sh
@@ -5,5 +5,5 @@ GATEWAY=$(ls $HOME/lib | grep deployment-gateway-)
 if [ ! -n "$GATEWAY" ]; then
   echo "GateWay Is Null !!!"
 else
-  nohup java -jar -server -Dgateway.log=$HOME $HOME/lib/$GATEWAY -c $HOME/config/gateway.conf $* >$HOME/bin/gw.out 2>&1 &
+  nohup java -jar -server -Djdchain.log=$HOME $HOME/lib/$GATEWAY -c $HOME/config/gateway.conf $* >$HOME/bin/gw.out 2>&1 &
 fi
\ No newline at end of file
diff --git a/source/deployment/deployment-peer/src/main/resources/scripts/ledger-init.sh b/source/deployment/deployment-peer/src/main/resources/scripts/ledger-init.sh
index 660676e8..eebc689b 100644
--- a/source/deployment/deployment-peer/src/main/resources/scripts/ledger-init.sh
+++ b/source/deployment/deployment-peer/src/main/resources/scripts/ledger-init.sh
@@ -5,5 +5,5 @@ boot_file=$(ls $HOME/libs | grep tools-initializer-booter-)
 if [ ! -n "$boot_file" ]; then
   echo "tools-initializer-booter is null"
 else
-  java -jar -server -Dinit.log=$HOME $HOME/libs/$boot_file -l $HOME/config/init/local.conf -i $HOME/config/init/ledger.init $*
+  java -jar -server -Djdchain.log=$HOME $HOME/libs/$boot_file -l $HOME/config/init/local.conf -i $HOME/config/init/ledger.init $*
 fi
\ No newline at end of file
diff --git a/source/deployment/deployment-peer/src/main/resources/scripts/manager-startup.sh b/source/deployment/deployment-peer/src/main/resources/scripts/manager-startup.sh
index 8336e219..790dfdfd 100644
--- a/source/deployment/deployment-peer/src/main/resources/scripts/manager-startup.sh
+++ b/source/deployment/deployment-peer/src/main/resources/scripts/manager-startup.sh
@@ -5,5 +5,5 @@ UMP=$(ls $HOME/manager | grep manager-booter-)
 if [ ! -n "UMP" ]; then
   echo "JDChain Manager Is Null !!!"
 else
-  nohup java -jar -server -Djump.log=$HOME $HOME/manager/$UMP -home $HOME -p 8000 $* >$HOME/bin/jump.out 2>&1 &
+  nohup java -jar -server -Djdchain.log=$HOME $HOME/manager/$UMP -home $HOME -p 8000 $* >$HOME/bin/jump.out 2>&1 &
 fi
\ No newline at end of file
diff --git a/source/deployment/deployment-peer/src/main/resources/scripts/peer-startup.sh b/source/deployment/deployment-peer/src/main/resources/scripts/peer-startup.sh
index d0fdd3d5..bbdf3aa7 100644
--- a/source/deployment/deployment-peer/src/main/resources/scripts/peer-startup.sh
+++ b/source/deployment/deployment-peer/src/main/resources/scripts/peer-startup.sh
@@ -5,5 +5,5 @@ PEER=$(ls $HOME/system | grep deployment-peer-)
 if [ ! -n "$PEER" ]; then
   echo "Peer Is Null !!!"
 else
-  nohup java -jar -server -Xmx2g -Xms2g -Dpeer.log=$HOME $HOME/system/$PEER -home=$HOME -c $HOME/config/ledger-binding.conf -p 7080 $* >$HOME/bin/peer.out 2>&1 &
+  nohup java -jar -server -Xmx2g -Xms2g -Djdchain.log=$HOME $HOME/system/$PEER -home=$HOME -c $HOME/config/ledger-binding.conf -p 7080 $* >$HOME/bin/peer.out 2>&1 &
 fi
\ No newline at end of file
diff --git a/source/gateway/src/main/resources/log4j2.xml b/source/gateway/src/main/resources/log4j2.xml
index 6b49c3e9..9a3b1d39 100644
--- a/source/gateway/src/main/resources/log4j2.xml
+++ b/source/gateway/src/main/resources/log4j2.xml
@@ -13,12 +13,12 @@
             <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
         </console>
         <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，适合临时测试用-->
-        <File name="log" fileName="${sys:gateway.log}/logs/gateway.temp.log" append="false">
+        <File name="log" fileName="${sys:jdchain.log}/logs/gateway.temp.log" append="false">
             <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
         </File>
         <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
-        <RollingFile name="GatewayRollingInfo" fileName="${sys:gateway.log}/logs/gateway.info.log"
-                     filePattern="${sys:gateway.log}/logs/$${date:yyyy-MM}/gateway.info-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="GatewayRollingInfo" fileName="${sys:jdchain.log}/logs/gateway.info.log"
+                     filePattern="${sys:jdchain.log}/logs/$${date:yyyy-MM}/gateway.info-%d{yyyy-MM-dd}-%i.log">
             <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
             <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
@@ -27,8 +27,8 @@
                 <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>
         </RollingFile>
-        <RollingFile name="GatewayRollingWarn" fileName="${sys:gateway.log}/logs/gateway.warn.log"
-                     filePattern="${sys:gateway.log}/logs/$${date:yyyy-MM}/gateway.out.warn-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="GatewayRollingWarn" fileName="${sys:jdchain.log}/logs/gateway.warn.log"
+                     filePattern="${sys:jdchain.log}/logs/$${date:yyyy-MM}/gateway.out.warn-%d{yyyy-MM-dd}-%i.log">
             <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
             <Policies>
@@ -38,8 +38,8 @@
             <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
             <DefaultRolloverStrategy max="20"/>
         </RollingFile>
-        <RollingFile name="GatewayRollingError" fileName="${sys:gateway.log}/logs/gateway.error.log"
-                     filePattern="${sys:gateway.log}/logs/$${date:yyyy-MM}/gateway.error-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="GatewayRollingError" fileName="${sys:jdchain.log}/logs/gateway.error.log"
+                     filePattern="${sys:jdchain.log}/logs/$${date:yyyy-MM}/gateway.error-%d{yyyy-MM-dd}-%i.log">
             <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
             <Policies>
diff --git a/source/manager/manager-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java b/source/manager/manager-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java
index 2312b83a..bf13fa58 100644
--- a/source/manager/manager-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java
+++ b/source/manager/manager-booter/src/main/java/com/jd/blockchain/ump/UmpBooter.java
@@ -193,6 +193,7 @@ public class UmpBooter {
         URL toolsJarURL = toolsJarURL();
         if (toolsJarURL != null) {
             totalURLs.add(toolsJarURL);
+            System.out.printf("Loaded tools.jar[%s]! \r\n", toolsJarURL);
         }
         URL[] totalURLArray = new URL[totalURLs.size()];
         return totalURLs.toArray(totalURLArray);
diff --git a/source/manager/manager-booter/src/main/resources/log4j2-jump.xml b/source/manager/manager-booter/src/main/resources/log4j2-jump.xml
index 6b19f527..7ea93dbd 100644
--- a/source/manager/manager-booter/src/main/resources/log4j2-jump.xml
+++ b/source/manager/manager-booter/src/main/resources/log4j2-jump.xml
@@ -13,8 +13,8 @@
             <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
         </console>
         <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
-        <RollingFile name="UmpRollingInfo" fileName="${sys:jump.log}/logs/ump.info.log"
-                     filePattern="${sys:jump.log}/logs/$${date:yyyy-MM}/ump.info-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="UmpRollingInfo" fileName="${sys:jdchain.log}/logs/ump.info.log"
+                     filePattern="${sys:jdchain.log}/logs/$${date:yyyy-MM}/ump.info-%d{yyyy-MM-dd}-%i.log">
             <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
             <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
@@ -23,8 +23,8 @@
                 <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>
         </RollingFile>
-        <RollingFile name="UmpRollingError" fileName="${sys:jump.log}/logs/ump.error.log"
-                     filePattern="${sys:jump.log}/logs/$${date:yyyy-MM}/ump.error-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="UmpRollingError" fileName="${sys:jdchain.log}/logs/ump.error.log"
+                     filePattern="${sys:jdchain.log}/logs/$${date:yyyy-MM}/ump.error-%d{yyyy-MM-dd}-%i.log">
             <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
             <Policies>
diff --git a/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java
index 807c72b8..216a1e85 100644
--- a/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java
+++ b/source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/UmpConstant.java
@@ -106,7 +106,7 @@ public class UmpConstant {
 
     public static final String PATH_LEDGER_INIT_BIN = PATH_BIN + File.separator + "ledger-init.sh";
 
-    public static final String PATH_STARTUP_BIN = PATH_BIN + File.separator + "startup.sh";
+    public static final String PATH_PEER_STARTUP_BIN = PATH_BIN + File.separator + "peer-startup.sh";
 
     public static final String PATH_LIBS = File.separator + "libs";
 
diff --git a/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/LedgerServiceHandler.java b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/LedgerServiceHandler.java
index f78aef42..7ff587d7 100644
--- a/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/LedgerServiceHandler.java
+++ b/source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/LedgerServiceHandler.java
@@ -84,7 +84,7 @@ public class LedgerServiceHandler implements LedgerService {
     @Override
     public String peerStartCommand(String peerPath) {
         return String.format(UmpConstant.CMD_START_UP_FORMAT,
-                peerPath + UmpConstant.PATH_STARTUP_BIN);
+                peerPath + UmpConstant.PATH_PEER_STARTUP_BIN);
     }
 
     @Override
diff --git a/source/peer/src/main/resources/log4j2.xml b/source/peer/src/main/resources/log4j2.xml
index 3f7b9d7a..2ee82e89 100644
--- a/source/peer/src/main/resources/log4j2.xml
+++ b/source/peer/src/main/resources/log4j2.xml
@@ -13,12 +13,12 @@
             <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
         </console>
         <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，适合临时测试用-->
-        <File name="log" fileName="${sys:peer.log}/logs/peer.temp.log" append="false">
+        <File name="log" fileName="${sys:jdchain.log}/logs/peer.temp.log" append="false">
             <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
         </File>
         <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
-        <RollingFile name="PeerRollingInfo" fileName="${sys:peer.log}/logs/peer.info.log"
-                     filePattern="${sys:peer.log}/logs/$${date:yyyy-MM}/peer.info-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="PeerRollingInfo" fileName="${sys:jdchain.log}/logs/peer.info.log"
+                     filePattern="${sys:jdchain.log}/logs/$${date:yyyy-MM}/peer.info-%d{yyyy-MM-dd}-%i.log">
             <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
             <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
@@ -27,8 +27,8 @@
                 <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>
         </RollingFile>
-        <RollingFile name="PeerRollingWarn" fileName="${sys:peer.log}/logs/peer.warn.log"
-                     filePattern="${sys:peer.log}/logs/$${date:yyyy-MM}/peer.warn-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="PeerRollingWarn" fileName="${sys:jdchain.log}/logs/peer.warn.log"
+                     filePattern="${sys:jdchain.log}/logs/$${date:yyyy-MM}/peer.warn-%d{yyyy-MM-dd}-%i.log">
             <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
             <Policies>
@@ -38,8 +38,8 @@
             <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
             <DefaultRolloverStrategy max="20"/>
         </RollingFile>
-        <RollingFile name="PeerRollingError" fileName="${sys:peer.log}/logs/peer.error.log"
-                     filePattern="${sys:peer.log}/logs/$${date:yyyy-MM}/peer.error-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="PeerRollingError" fileName="${sys:jdchain.log}/logs/peer.error.log"
+                     filePattern="${sys:jdchain.log}/logs/$${date:yyyy-MM}/peer.error-%d{yyyy-MM-dd}-%i.log">
             <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
             <Policies>
diff --git a/source/tools/tools-initializer/src/main/resources/log4j2-init.xml b/source/tools/tools-initializer/src/main/resources/log4j2-init.xml
index 6ef49baf..fe98c0c1 100644
--- a/source/tools/tools-initializer/src/main/resources/log4j2-init.xml
+++ b/source/tools/tools-initializer/src/main/resources/log4j2-init.xml
@@ -13,12 +13,12 @@
             <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
         </console>
         <!--文件会打印出所有信息，这个log每次运行程序会自动清空，由append属性决定，适合临时测试用-->
-        <File name="log" fileName="${sys:init.log}/logs/init.temp.log" append="false">
+        <File name="log" fileName="${sys:jdchain.log}/logs/init.temp.log" append="false">
             <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36} %L %M - %msg%xEx%n"/>
         </File>
         <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档-->
-        <RollingFile name="InitRollingInfo" fileName="${sys:init.log}/logs/init.info.log"
-                     filePattern="${sys:init.log}/logs/$${date:yyyy-MM}/init.info-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="InitRollingInfo" fileName="${sys:jdchain.log}/logs/init.info.log"
+                     filePattern="${sys:jdchain.log}/logs/$${date:yyyy-MM}/init.info-%d{yyyy-MM-dd}-%i.log">
             <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
             <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
@@ -27,8 +27,8 @@
                 <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>
         </RollingFile>
-        <RollingFile name="InitRollingWarn" fileName="${sys:init.log}/logs/init.warn.log"
-                     filePattern="${sys:init.log}/logs/$${date:yyyy-MM}/init.warn-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="InitRollingWarn" fileName="${sys:jdchain.log}/logs/init.warn.log"
+                     filePattern="${sys:jdchain.log}/logs/$${date:yyyy-MM}/init.warn-%d{yyyy-MM-dd}-%i.log">
             <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
             <Policies>
@@ -38,8 +38,8 @@
             <!-- DefaultRolloverStrategy属性如不设置，则默认为最多同一文件夹下7个文件，这里设置了20 -->
             <DefaultRolloverStrategy max="20"/>
         </RollingFile>
-        <RollingFile name="InitRollingError" fileName="${sys:init.log}/logs/init.error.log"
-                     filePattern="${sys:init.log}/logs/$${date:yyyy-MM}/init.error-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="InitRollingError" fileName="${sys:jdchain.log}/logs/init.error.log"
+                     filePattern="${sys:jdchain.log}/logs/$${date:yyyy-MM}/init.error-%d{yyyy-MM-dd}-%i.log">
             <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="[%d{HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
             <Policies>