Browse Source

add peer connect's log

tags/1.1.11
shaozhuguang 5 years ago
parent
commit
0fcadea494
2 changed files with 21 additions and 4 deletions
  1. +8
    -4
      source/gateway/src/main/java/com/jd/blockchain/gateway/service/PeerConnectionManager.java
  2. +13
    -0
      source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerBlockchainServiceFactory.java

+ 8
- 4
source/gateway/src/main/java/com/jd/blockchain/gateway/service/PeerConnectionManager.java View File

@@ -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 ------");


+ 13
- 0
source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerBlockchainServiceFactory.java View File

@@ -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);
}


Loading…
Cancel
Save