diff --git a/core b/core index 4f4fb68e..86d3b678 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 4f4fb68eea4c046102971fdc92720cc43605d05a +Subproject commit 86d3b6786aedd814f9be5263f3c4012cb7a2ad63 diff --git a/deploy/deploy-gateway/src/main/resources/scripts/shutdown.sh b/deploy/deploy-gateway/src/main/resources/scripts/shutdown.sh index 068c5ed0..2a39f249 100644 --- a/deploy/deploy-gateway/src/main/resources/scripts/shutdown.sh +++ b/deploy/deploy-gateway/src/main/resources/scripts/shutdown.sh @@ -41,23 +41,19 @@ checkpid() { #注意: 在shell编程中,"$?" 表示上一句命令或者一个函数的返回值 ################################### stop() { - checkpid - - if [[ $psid -ne 0 ]]; then - echo "Stopping Gateway ......(pid=$psid) " - JAVA_CMD="kill -9 $psid" - sleep 1 - $JAVA_CMD - if [[ $? -eq 0 ]]; then - echo "[OK]" + checkpid + if [[ $psid -ne 0 ]]; then + echo "Stopping Gateway (PID = $psid) ......" + kill $psid + while kill -0 $psid 2>/dev/null; do sleep 1; done + echo "================================" + echo "Success" + echo "================================" else - echo "[Failed]" + echo "================================" + echo "WARN: Gateway is not running" + echo "================================" fi - else - echo "================================" - echo "WARN: Gateway is not running" - echo "================================" - fi } diff --git a/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config b/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config index cbf88f82..3bafbaee 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config +++ b/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config @@ -72,7 +72,7 @@ system.servers.num = 4 system.servers.f = 1 #Timeout to asking for a client request -system.totalordermulticast.timeout = 60000 +#system.totalordermulticast.timeout = 60000 #Allowable time tolerance range(millisecond) system.totalordermulticast.timeTolerance = 3000000 diff --git a/deploy/deploy-peer/src/main/resources/scripts/manager-shutdown.sh b/deploy/deploy-peer/src/main/resources/scripts/manager-shutdown.sh index e5f6b292..3974ce8f 100644 --- a/deploy/deploy-peer/src/main/resources/scripts/manager-shutdown.sh +++ b/deploy/deploy-peer/src/main/resources/scripts/manager-shutdown.sh @@ -8,9 +8,14 @@ PID=`ps -ef | grep $BOOT_HOME/manager/manager-booter | grep -v grep | awk '{prin #通过Kill命令将进程杀死 if [ -z "$PID" ]; then - echo "Unable to find JDChain Manager PID. stop aborted." + echo "================================" + echo "WARN: Unable to find JD Chain Manager PID($PID)." + echo "================================" else - echo "Start to kill PID = $PID ..." - kill -9 $PID - echo "JDChain Manager has been stopped ..." + echo "Stopping Manager (PID = $PID) ......" + kill $PID + while kill -0 $PID 2>/dev/null; do sleep 1; done + echo "================================" + echo "Success" + echo "================================" fi \ No newline at end of file diff --git a/deploy/deploy-peer/src/main/resources/scripts/peer-shutdown.sh b/deploy/deploy-peer/src/main/resources/scripts/peer-shutdown.sh index cd4c21dc..968eb61b 100644 --- a/deploy/deploy-peer/src/main/resources/scripts/peer-shutdown.sh +++ b/deploy/deploy-peer/src/main/resources/scripts/peer-shutdown.sh @@ -41,23 +41,19 @@ checkpid() { #注意: 在shell编程中,"$?" 表示上一句命令或者一个函数的返回值 ################################### stop() { - checkpid - - if [[ $psid -ne 0 ]]; then - echo "Stopping Peer ......(pid=$psid) " - JAVA_CMD="kill -9 $psid" - sleep 1 - $JAVA_CMD - if [[ $? -eq 0 ]]; then - echo "[OK]" + checkpid + if [[ $psid -ne 0 ]]; then + echo "Stopping Peer (PID = $psid) ......" + kill $psid + while kill -0 $psid 2>/dev/null; do sleep 1; done + echo "================================" + echo "Success" + echo "================================" else - echo "[Failed]" + echo "================================" + echo "WARN: Peer is not running" + echo "================================" fi - else - echo "================================" - echo "WARN: Peer is not running" - echo "================================" - fi } diff --git a/libs/bft-smart b/libs/bft-smart index 7144cb64..465b42bb 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 7144cb6419866f0ae25fc38446e89123d070e611 +Subproject commit 465b42bb5793c2bcb61c2789317a85608d13d19e diff --git a/libs/httpservice b/libs/httpservice index 2ff588e3..0aad08bc 160000 --- a/libs/httpservice +++ b/libs/httpservice @@ -1 +1 @@ -Subproject commit 2ff588e3adb44e733caf730b27917fa5e46f0129 +Subproject commit 0aad08bc7e8fe769178d6ca9a1184f4acc33e913 diff --git a/libs/utils b/libs/utils index 6662f189..dedda124 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 6662f18965b23910f04432488a9e10893e94f21d +Subproject commit dedda124dfeb4488ece714d1e6af24b8d5f0a17a diff --git a/pom.xml b/pom.xml index 05dacb93..d080517b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-root - 1.5.0-SNAPSHOT + 1.5.0.RELEASE pom jdchain root project diff --git a/project b/project index e6a91274..ec38eec4 160000 --- a/project +++ b/project @@ -1 +1 @@ -Subproject commit e6a91274cc35748ad903e432aaf34e41b3803702 +Subproject commit ec38eec4a6269e7abd35d9ea1b67417a97815bf9 diff --git a/samples/contract-samples/pom.xml b/samples/contract-samples/pom.xml index 9b762555..67c844ee 100644 --- a/samples/contract-samples/pom.xml +++ b/samples/contract-samples/pom.xml @@ -6,7 +6,7 @@ com.jd.blockchain jdchain-samples - 1.4.3.RELEASE + 1.5.0.RELEASE diff --git a/samples/pom.xml b/samples/pom.xml index 90cf1cb6..65e26b59 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -4,11 +4,11 @@ 4.0.0 com.jd.blockchain jdchain-samples - 1.4.3.RELEASE + 1.5.0.RELEASE pom - 1.4.3.RELEASE + 1.5.0.RELEASE diff --git a/samples/sdk-samples/pom.xml b/samples/sdk-samples/pom.xml index d7836222..099cbb16 100644 --- a/samples/sdk-samples/pom.xml +++ b/samples/sdk-samples/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain jdchain-samples - 1.4.3.RELEASE + 1.5.0.RELEASE sdk-samples diff --git a/test b/test index f327dda2..91e08505 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit f327dda22070b123e70459848e9922f764912bbe +Subproject commit 91e08505fbc0ccbd7cb3e5e04bea3d7c92c6a0e2