From d743b265b6d003ae50ae563ee7f7f2e4fb3d193e Mon Sep 17 00:00:00 2001 From: shaozhuguang Date: Tue, 30 Jun 2020 15:29:50 +0800 Subject: [PATCH] modify level of log --- .../gateway/service/PeerConnectionManager.java | 4 ++-- source/sdk/sdk-base/pom.xml | 6 ------ .../sdk/service/PeerBlockchainServiceFactory.java | 13 ------------- .../jd/blockchain/sdk/service/PeerServiceProxy.java | 3 --- 4 files changed, 2 insertions(+), 24 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 f3d682e1..155b4872 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 @@ -400,7 +400,7 @@ public class PeerConnectionManager implements PeerService, PeerConnector { if (ledgerHashs != null) { ledgerSize = ledgerHashs.length; for (HashDigest h : ledgerHashs) { - LOGGER.info("Most peer[{}] get ledger direct [{}]", mostLedgerPeerServiceFactory.peerAddress, h.toBase58()); + LOGGER.debug("Most peer[{}] get ledger direct [{}]", mostLedgerPeerServiceFactory.peerAddress, h.toBase58()); } } } @@ -423,7 +423,7 @@ public class PeerConnectionManager implements PeerService, PeerConnector { HashDigest[] tempLedgerHashs = ((PeerServiceProxy) loopBlockchainService).getLedgerHashsDirect(); if (tempLedgerHashs != null) { for (HashDigest h : tempLedgerHashs) { - LOGGER.info("Temp peer[{}] get ledger direct [{}]", entry.getKey(), h.toBase58()); + LOGGER.debug("Temp peer[{}] get ledger direct [{}]", entry.getKey(), h.toBase58()); } if (tempLedgerHashs.length > ledgerSize) { tempMostLedgerPeerServiceFactory = new PeerServiceFactory(entry.getKey(),entry.getValue()); diff --git a/source/sdk/sdk-base/pom.xml b/source/sdk/sdk-base/pom.xml index a4633d66..06c664fc 100644 --- a/source/sdk/sdk-base/pom.xml +++ b/source/sdk/sdk-base/pom.xml @@ -40,12 +40,6 @@ - - com.jd.blockchain - consensus-bftsmart - ${project.version} - - com.jd.blockchain utils-serialize 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 3bb613a5..72c7b75d 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 @@ -1,7 +1,6 @@ package com.jd.blockchain.sdk.service; import com.jd.blockchain.consensus.*; -import com.jd.blockchain.consensus.bftsmart.client.BftsmartClientSettings; import com.jd.blockchain.consensus.client.ClientFactory; import com.jd.blockchain.consensus.client.ClientSettings; import com.jd.blockchain.consensus.client.ConsensusClient; @@ -148,15 +147,6 @@ public class PeerBlockchainServiceFactory implements BlockchainServiceFactory, C ClientSettings clientSettings = clientFactory.buildClientSettings(clientIncomingSettings); ConsensusClient consensusClient = clientFactory.setupClient(clientSettings); - if (clientSettings instanceof BftsmartClientSettings) { - BftsmartClientSettings bftsmartClientSettings = (BftsmartClientSettings) clientSettings; - byte[] topology = bftsmartClientSettings.getTopology(); - byte[] tomConfig = bftsmartClientSettings.getTomConfig(); - LOGGER.info("Peer[{}] ledger = [{}] topology : {}, tomConfig : {}", peerAddr, - ledgerSetting.getLedgerHash().toBase58(), topology == null ? 0 : topology.length , - tomConfig == null ? 0 : tomConfig.length); - } - TransactionService autoSigningTxProcService = enableGatewayAutoSigning(gatewayKey, ledgerSetting.getCryptoSetting(), consensusClient); LedgerAccessContextImpl accCtx = new LedgerAccessContextImpl(); @@ -190,9 +180,6 @@ public class PeerBlockchainServiceFactory implements BlockchainServiceFactory, C } } } - -// PeerBlockchainServiceFactory factory = new PeerBlockchainServiceFactory(httpConnectionManager, -// accessAbleLedgers); } diff --git a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerServiceProxy.java b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerServiceProxy.java index 492cfe80..09e72dbd 100644 --- a/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerServiceProxy.java +++ b/source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerServiceProxy.java @@ -93,9 +93,6 @@ public class PeerServiceProxy extends BlockchainServiceProxy implements Transact Collection ctxs = ledgerAccessContexts.values(); for (LedgerAccessContext ctx : ctxs) { HashDigest[] hashs = ctx.getQueryService().getLedgerHashs(); - for (HashDigest h : hashs) { - LOGGER.info("Get ledger[{}] by [{}]'s AccessContext !!!", h.toBase58(), ctx.getLedgerHash().toBase58()); - } ledgerHashs.addAll(Arrays.asList(hashs)); } }