Browse Source

add logs

tags/1.1.11
shaozhuguang 5 years ago
parent
commit
77b42a86b3
3 changed files with 28 additions and 0 deletions
  1. +12
    -0
      source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/service/BftsmartConsensusManageService.java
  2. +6
    -0
      source/sdk/sdk-base/pom.xml
  3. +10
    -0
      source/sdk/sdk-base/src/main/java/com/jd/blockchain/sdk/service/PeerBlockchainServiceFactory.java

+ 12
- 0
source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/service/BftsmartConsensusManageService.java View File

@@ -3,16 +3,22 @@ package com.jd.blockchain.consensus.bftsmart.service;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;


import bftsmart.reconfiguration.util.TOMConfiguration;
import com.jd.blockchain.consensus.ClientIdentification; import com.jd.blockchain.consensus.ClientIdentification;
import com.jd.blockchain.consensus.ConsensusManageService; import com.jd.blockchain.consensus.ConsensusManageService;
import com.jd.blockchain.consensus.bftsmart.BftsmartClientIncomingConfig; import com.jd.blockchain.consensus.bftsmart.BftsmartClientIncomingConfig;
import com.jd.blockchain.consensus.bftsmart.BftsmartClientIncomingSettings; import com.jd.blockchain.consensus.bftsmart.BftsmartClientIncomingSettings;
import com.jd.blockchain.consensus.bftsmart.BftsmartTopology;
import com.jd.blockchain.crypto.Crypto; import com.jd.blockchain.crypto.Crypto;
import com.jd.blockchain.crypto.SignatureFunction; import com.jd.blockchain.crypto.SignatureFunction;
import com.jd.blockchain.utils.serialize.binary.BinarySerializeUtils; import com.jd.blockchain.utils.serialize.binary.BinarySerializeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


public class BftsmartConsensusManageService implements ConsensusManageService { public class BftsmartConsensusManageService implements ConsensusManageService {


private static Logger LOGGER = LoggerFactory.getLogger(BftsmartConsensusManageService.class);

public static final int GATEWAY_SIZE = 100; public static final int GATEWAY_SIZE = 100;


public static final int CLIENT_SIZE_PER_GATEWAY = 1000; public static final int CLIENT_SIZE_PER_GATEWAY = 1000;
@@ -34,6 +40,12 @@ public class BftsmartConsensusManageService implements ConsensusManageService {
@Override @Override
public BftsmartClientIncomingSettings authClientIncoming(ClientIdentification authId) { public BftsmartClientIncomingSettings authClientIncoming(ClientIdentification authId) {
if (verify(authId)) { if (verify(authId)) {
byte[] topology = BinarySerializeUtils.serialize(nodeServer.getTopology());
byte[] tomConfig = BinarySerializeUtils.serialize(nodeServer.getTomConfig());

LOGGER.info("topology:{}, tomConfig:{}", topology == null ? 0 : topology.length,
tomConfig == null ? 0: tomConfig.length);

BftsmartClientIncomingConfig clientIncomingSettings = new BftsmartClientIncomingConfig(); BftsmartClientIncomingConfig clientIncomingSettings = new BftsmartClientIncomingConfig();


clientIncomingSettings clientIncomingSettings


+ 6
- 0
source/sdk/sdk-base/pom.xml View File

@@ -40,6 +40,12 @@
</exclusions> </exclusions>
</dependency> </dependency>


<dependency>
<groupId>com.jd.blockchain</groupId>
<artifactId>consensus-bftsmart</artifactId>
<version>${project.version}</version>
</dependency>

<dependency> <dependency>
<groupId>com.jd.blockchain</groupId> <groupId>com.jd.blockchain</groupId>
<artifactId>utils-serialize</artifactId> <artifactId>utils-serialize</artifactId>


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

@@ -1,6 +1,7 @@
package com.jd.blockchain.sdk.service; package com.jd.blockchain.sdk.service;


import com.jd.blockchain.consensus.*; 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.ClientFactory;
import com.jd.blockchain.consensus.client.ClientSettings; import com.jd.blockchain.consensus.client.ClientSettings;
import com.jd.blockchain.consensus.client.ConsensusClient; import com.jd.blockchain.consensus.client.ConsensusClient;
@@ -152,6 +153,15 @@ public class PeerBlockchainServiceFactory implements BlockchainServiceFactory, C
ClientSettings clientSettings = clientFactory.buildClientSettings(clientIncomingSettings); ClientSettings clientSettings = clientFactory.buildClientSettings(clientIncomingSettings);
ConsensusClient consensusClient = clientFactory.setupClient(clientSettings); 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, TransactionService autoSigningTxProcService = enableGatewayAutoSigning(gatewayKey,
ledgerSetting.getCryptoSetting(), consensusClient); ledgerSetting.getCryptoSetting(), consensusClient);




Loading…
Cancel
Save