From 0fcadea494781fa8c656ad5a12bff750b7df5464 Mon Sep 17 00:00:00 2001 From: shaozhuguang Date: Mon, 29 Jun 2020 10:18:57 +0800 Subject: [PATCH] add peer connect's log --- .../gateway/service/PeerConnectionManager.java | 12 ++++++++---- .../sdk/service/PeerBlockchainServiceFactory.java | 13 +++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/source/gateway/src/main/java/com/jd/blockchain/gateway/service/PeerConnectionManager.java b/source/gateway/src/main/java/com/jd/blockchain/gateway/service/PeerConnectionManager.java index 3bbcc616..528fab9f 100644 --- a/source/gateway/src/main/java/com/jd/blockchain/gateway/service/PeerConnectionManager.java +++ b/source/gateway/src/main/java/com/jd/blockchain/gateway/service/PeerConnectionManager.java @@ -135,10 +135,14 @@ public class PeerConnectionManager implements PeerService, PeerConnector { // 有新账本的情况下重连，并更新本地账本 PeerBlockchainServiceFactory peerServiceFactory = PeerBlockchainServiceFactory.connect( gateWayKeyPair, peerAddress, peerProviders); - peerBlockchainServiceFactories.put(peerAddress, peerServiceFactory); - localLedgerCache.addAll(Arrays.asList(peerLedgerHashs)); - mostLedgerPeerServiceFactory = new PeerServiceFactory(peerAddress, peerServiceFactory); - LOGGER.info("Most ledgers remote update to {}", mostLedgerPeerServiceFactory.peerAddress); + if (peerServiceFactory != null) { + peerBlockchainServiceFactories.put(peerAddress, peerServiceFactory); + localLedgerCache.addAll(Arrays.asList(peerLedgerHashs)); + mostLedgerPeerServiceFactory = new PeerServiceFactory(peerAddress, peerServiceFactory); + LOGGER.info("Most ledgers remote update to {}", mostLedgerPeerServiceFactory.peerAddress); + } else { + LOGGER.error("Peer connect fail {}", peerAddress); + } } } LOGGER.info("------ Load ledgers complete ------"); diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerBlockchainServiceFactory.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerBlockchainServiceFactory.java index ef236049..1d76163e 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerBlockchainServiceFactory.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerBlockchainServiceFactory.java @@ -132,6 +132,7 @@ public class PeerBlockchainServiceFactory implements BlockchainServiceFactory, C for (LedgerIncomingSetting setting : ledgerSettings) { HashDigest currLedgerHash = setting.getLedgerHash(); if (!currentPeerLedgers.contains(currLedgerHash)) { + LOGGER.info("Peer[{}] find new ledger [{}]", peerAddr, currLedgerHash.toBase58()); needInitSettings.add(setting); } } @@ -173,10 +174,22 @@ public class PeerBlockchainServiceFactory implements BlockchainServiceFactory, C accessAbleLedgers); factory.accessContextMap.putAll(tempAccessCtxs); peerBlockchainServiceFactories.put(peerAddr, factory); + if (!tempAccessCtxs.isEmpty()) { + for (HashDigest hash : tempAccessCtxs.keySet()) { + LOGGER.info("First connect, peer[{}] init new ledger[{}] OK !!!", peerAddr, hash.toBase58()); + } + } + } else { factory.accessContextMap.putAll(tempAccessCtxs); factory.addLedgerAccessContexts(accessAbleLedgers); + if (!tempAccessCtxs.isEmpty()) { + for (HashDigest hash : tempAccessCtxs.keySet()) { + LOGGER.info("Reconnect, peer[{}] init new ledger[{}] OK !!!", peerAddr, hash.toBase58()); + } + } } + // PeerBlockchainServiceFactory factory = new PeerBlockchainServiceFactory(httpConnectionManager, // accessAbleLedgers); }