Merge pull request #334 from JimmyShi22/master

Delete netstat
WeBankBlockchain · Aug 18, 2020 · a0e24c6 · a0e24c6
2 parents 735bb3c + 5a58e46
commit a0e24c6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 19 deletions.
diff --git a/demo/build.sh b/demo/build.sh
@@ -60,7 +60,7 @@ check_port_avaliable()
 {
     port=$1
     name=$2
-    if [ "$(netstat -npl 2>/dev/null |grep $port | wc -l)" -ne "0" ]; then
+    if [ "$(netstat -na 2>/dev/null |grep $port | wc -l)" -ne "0" ]; then
         LOG_ERROR "${name} port ${port} is not avaliable. Are there any other blockchain is running?"
         exit 1
     fi
@@ -390,9 +390,6 @@ EOF
     config_router_8250 ${ROOT}/routers-payment/127.0.0.1-8250-25500/ ${ROOT}/fabric ${ROOT}/bcos
     config_router_8251 ${ROOT}/routers-payment/127.0.0.1-8251-25501/ ${ROOT}/fabric
 
-    # print running env
-    netstat -napl|grep 20200
-
     # Start up routers
     cd ${ROOT}/routers-payment/127.0.0.1-8250-25500/
     bash start.sh

diff --git a/demo/build_cross_gm.sh b/demo/build_cross_gm.sh
@@ -60,7 +60,7 @@ check_port_avaliable()
 {
     port=$1
     name=$2
-    if [ "$(netstat -npl 2>/dev/null |grep $port | wc -l)" -ne "0" ]; then
+    if [ "$(netstat -na 2>/dev/null |grep $port | wc -l)" -ne "0" ]; then
         LOG_ERROR "${name} port ${port} is not avaliable. Are there any other blockchain is running?"
         exit 1
     fi
@@ -342,9 +342,6 @@ EOF
     config_router_8250 ${ROOT}/routers-payment/127.0.0.1-8250-25500/
     config_router_8251 ${ROOT}/routers-payment/127.0.0.1-8251-25501/
 
-    # print running env
-    netstat -napl|grep 20200
-
     # Start up routers
     cd ${ROOT}/routers-payment/127.0.0.1-8250-25500/
     bash start.sh

diff --git a/demo/build_cross_groups.sh b/demo/build_cross_groups.sh
@@ -60,7 +60,7 @@ check_port_avaliable()
 {
     port=$1
     name=$2
-    if [ "$(netstat -npl 2>/dev/null |grep $port | wc -l)" -ne "0" ]; then
+    if [ "$(netstat -na 2>/dev/null |grep $port | wc -l)" -ne "0" ]; then
         LOG_ERROR "${name} port ${port} is not avaliable. Are there any other blockchain is running?"
         exit 1
     fi
@@ -333,9 +333,6 @@ EOF
     config_router_8250 ${ROOT}/routers-payment/127.0.0.1-8250-25500/
     config_router_8251 ${ROOT}/routers-payment/127.0.0.1-8251-25501/
 
-    # print running env
-    netstat -napl|grep 20200
-
     # Start up routers
     cd ${ROOT}/routers-payment/127.0.0.1-8250-25500/
     bash start.sh

diff --git a/demo/build_single_bcos.sh b/demo/build_single_bcos.sh
@@ -48,7 +48,7 @@ check_port_avaliable()
 {
     port=$1
     name=$2
-    if [ "$(netstat -npl 2>/dev/null |grep $port | wc -l)" -ne "0" ]; then
+    if [ "$(netstat -na 2>/dev/null |grep $port | wc -l)" -ne "0" ]; then
         LOG_ERROR "${name} port ${port} is not avaliable. Are there any other blockchain is running?"
         exit 1
     fi
@@ -251,9 +251,6 @@ EOF
     # config routers
     config_router_8250 ${ROOT}/routers-payment/127.0.0.1-8250-25500/ ${ROOT}/fabric ${ROOT}/bcos
 
-    # print running env
-    netstat -napl|grep 20200
-
     # Start up routers
     cd ${ROOT}/routers-payment/127.0.0.1-8250-25500/
     bash start.sh

diff --git a/demo/htlc_config.sh b/demo/htlc_config.sh
@@ -152,9 +152,6 @@ EOF
 
 restart_router()
 {
-    # print running env
-    netstat -napl|grep 20200
-
     LOG_INFO "Restart routers ..."
 
     cd ${ROOT}/routers-payment/127.0.0.1-8250-25500/