From 7a1ffb8091f7a9b5b5dfdd90c7d0d8774b3c3ed5 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Mon, 11 Dec 2023 10:53:01 +1000 Subject: [PATCH 1/3] log bootnodes and static nodes list at debug level Signed-off-by: Sally MacFarlane --- .../java/org/hyperledger/besu/cli/BesuCommand.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java index b2cd625e9ec..8647700abdf 100644 --- a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java @@ -2120,8 +2120,6 @@ private void configure() throws Exception { instantiateSignatureAlgorithmFactory(); logger.info(generateConfigurationOverview()); - logger.info("Connecting to {} static nodes.", staticNodes.size()); - logger.trace("Static Nodes = {}", staticNodes); logger.info("Security Module: {}", securityModuleName); } @@ -3119,6 +3117,9 @@ private EthNetworkConfig updateNetworkConfig(final NetworkName network) { if (listBootNodes != null) { if (!p2PDiscoveryOptionGroup.peerDiscoveryEnabled) { logger.warn("Discovery disabled: bootnodes will be ignored."); + } else { + logger.info("Configured {} bootnodes.", p2PDiscoveryOptionGroup.bootNodes.size()); + logger.debug("Bootnodes = {}", p2PDiscoveryOptionGroup.bootNodes); } DiscoveryConfiguration.assertValidBootnodes(listBootNodes); builder.setBootNodes(listBootNodes); @@ -3224,7 +3225,11 @@ private Set loadStaticNodes() throws IOException { staticNodesPath = dataDir().resolve(staticNodesFilename); } logger.debug("Static Nodes file: {}", staticNodesPath); - return StaticNodesParser.fromPath(staticNodesPath, getEnodeDnsConfiguration()); + final Set staticNodes = + StaticNodesParser.fromPath(staticNodesPath, getEnodeDnsConfiguration()); + logger.info("Connecting to {} static nodes.", staticNodes.size()); + logger.debug("Static Nodes = {}", staticNodes); + return staticNodes; } private List buildEnodes( From 4cefd7d364e61db4d2e4d7e187994a70e1f8efeb Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Mon, 11 Dec 2023 11:02:12 +1000 Subject: [PATCH 2/3] log if zero bootnodes Signed-off-by: Sally MacFarlane --- besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java index 8647700abdf..726a5a8b34a 100644 --- a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java @@ -3123,6 +3123,8 @@ private EthNetworkConfig updateNetworkConfig(final NetworkName network) { } DiscoveryConfiguration.assertValidBootnodes(listBootNodes); builder.setBootNodes(listBootNodes); + } else { + logger.debug("0 Bootnodes configured"); } return builder.build(); } From b7545ba14546bb9cc1f39db12dc91852be904825 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Mon, 11 Dec 2023 11:52:32 +1000 Subject: [PATCH 3/3] null safeguards Signed-off-by: Sally MacFarlane --- .../src/main/java/org/hyperledger/besu/cli/BesuCommand.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java index 726a5a8b34a..b42c4aad977 100644 --- a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java @@ -3118,13 +3118,13 @@ private EthNetworkConfig updateNetworkConfig(final NetworkName network) { if (!p2PDiscoveryOptionGroup.peerDiscoveryEnabled) { logger.warn("Discovery disabled: bootnodes will be ignored."); } else { - logger.info("Configured {} bootnodes.", p2PDiscoveryOptionGroup.bootNodes.size()); - logger.debug("Bootnodes = {}", p2PDiscoveryOptionGroup.bootNodes); + logger.info("Configured {} bootnodes.", listBootNodes.size()); + logger.debug("Bootnodes = {}", listBootNodes); } DiscoveryConfiguration.assertValidBootnodes(listBootNodes); builder.setBootNodes(listBootNodes); } else { - logger.debug("0 Bootnodes configured"); + logger.info("0 Bootnodes configured"); } return builder.build(); }