From f7e789339c9359d45f77c3f3fea1fba3b3105650 Mon Sep 17 00:00:00 2001 From: zhaoguangwei Date: Fri, 10 Apr 2020 15:03:01 +0800 Subject: [PATCH] use the -DhostIp=xxx in the shell; --- .../bftsmart/service/BftsmartNodeServer.java | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/service/BftsmartNodeServer.java b/source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/service/BftsmartNodeServer.java index 61a6a619..5574c2b3 100644 --- a/source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/service/BftsmartNodeServer.java +++ b/source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/service/BftsmartNodeServer.java @@ -33,7 +33,7 @@ public class BftsmartNodeServer extends DefaultRecoverable implements NodeServer private static Logger LOGGER = LoggerFactory.getLogger(BftsmartNodeServer.class); - private static final String DEFAULT_BINDING_HOST = "0.0.0.0"; +// private static final String DEFAULT_BINDING_HOST = "0.0.0.0"; private List stateHandles = new CopyOnWriteArrayList<>(); @@ -59,7 +59,7 @@ public class BftsmartNodeServer extends DefaultRecoverable implements NodeServer private TOMConfiguration tomConfig; - private TOMConfiguration outerTomConfig; +// private TOMConfiguration outerTomConfig; private HostsConfig hostsConfig; private Properties systemConfig; @@ -129,12 +129,20 @@ public class BftsmartNodeServer extends DefaultRecoverable implements NodeServer } protected void initConfig(int id, Properties systemsConfig, HostsConfig hostConfig) { - byte[] serialHostConf = BinarySerializeUtils.serialize(hostConfig); - Properties sysConfClone = (Properties)systemsConfig.clone(); +// byte[] serialHostConf = BinarySerializeUtils.serialize(hostConfig); +// Properties sysConfClone = (Properties)systemsConfig.clone(); int port = hostConfig.getPort(id); - hostConfig.add(id, DEFAULT_BINDING_HOST, port); +// hostConfig.add(id, DEFAULT_BINDING_HOST, port); + + //if ledger-init.sh set up the -DhostIp=xxx, then get it; + String preHostIp = System.getProperty("hostIp"); + if(preHostIp != null && preHostIp.length()>0){ + hostConfig.add(id, preHostIp, port); + System.out.println("###ledger-init.sh###,set up the -DhostIp="+preHostIp); + } + this.tomConfig = new TOMConfiguration(id, systemsConfig, hostConfig); - this.outerTomConfig = new TOMConfiguration(id, sysConfClone, BinarySerializeUtils.deserialize(serialHostConf)); +// this.outerTomConfig = new TOMConfiguration(id, systemsConfig, hostConfig); } @Override @@ -153,7 +161,7 @@ public class BftsmartNodeServer extends DefaultRecoverable implements NodeServer } public TOMConfiguration getTomConfig() { - return outerTomConfig; + return tomConfig; } public int getId() { @@ -165,7 +173,7 @@ public class BftsmartNodeServer extends DefaultRecoverable implements NodeServer throw new IllegalArgumentException("ReplicaID is negative!"); } this.tomConfig.setProcessId(id); - this.outerTomConfig.setProcessId(id); +// this.outerTomConfig.setProcessId(id); } public BftsmartConsensusSettings getConsensusSetting() {