From 008c24fe99f52c2864fab6b019ed1ec93bdd6f79 Mon Sep 17 00:00:00 2001
From: shaozhuguang <shaozhuguang@jd.com>
Date: Mon, 12 Aug 2019 19:24:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96Peer?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jd/blockchain/ump/service/UmpStateService.java |  4 +++
 .../ump/service/UmpStateServiceHandler.java        | 29 ++++++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStateService.java b/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStateService.java
index 161ed867..18ae5662 100644
--- a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStateService.java
+++ b/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStateService.java
@@ -59,4 +59,8 @@ public interface UmpStateService {
     List<LedgerInited> readLedgerIniteds(String search);
 
     String readLedgerHash(String ledgerAndNodeKey);
+
+    int peerPort(String peerPath);
+
+    int peerPort();
 }
diff --git a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStateServiceHandler.java b/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStateServiceHandler.java
index 5ed51aca..935e3e9e 100644
--- a/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStateServiceHandler.java
+++ b/source/manager/ump-service/src/main/java/com/jd/blockchain/ump/service/UmpStateServiceHandler.java
@@ -520,6 +520,31 @@ public class UmpStateServiceHandler implements UmpStateService, Closeable {
     }
 
     @Override
+    public int peerPort(String peerPath) {
+
+        String peerVerify = ledgerService.peerVerifyKey(peerPath);
+
+        try {
+            if (!CommandUtils.isActive(peerVerify)) {
+                // 进程不存在
+                LOGGER.info("Can not find Peer Process {} !!!", peerVerify);
+                return 0;
+            }
+            return listenPort(peerVerify);
+        } catch (Exception e) {
+            // 进程处理错误打印日志即可
+            LOGGER.error(String.format("Peer Port Check %s !!!", peerVerify), e);
+        }
+
+        return 0;
+    }
+
+    @Override
+    public int peerPort() {
+        return peerPort(UmpConstant.PROJECT_PATH);
+    }
+
+    @Override
     public void close() throws IOException {
 //        writeRunner.close();
     }
@@ -643,7 +668,7 @@ public class UmpStateServiceHandler implements UmpStateService, Closeable {
 
                     if (listenPort > 0) {
 
-                        int maxSize = 5, checkIndex = 1;
+                        int maxSize = 3, checkIndex = 1;
 
                         boolean isRead = false;
 
@@ -670,7 +695,7 @@ public class UmpStateServiceHandler implements UmpStateService, Closeable {
                                 }
 
                                 // 6秒休眠
-                                Thread.sleep(6000);
+                                Thread.sleep(3000);
                             } catch (Exception e) {
                                 LOGGER.error(String.format("Request LedgerHashs from PeerNode [%s]", checkIndex++), e);
                             }