From 3fa9f139931ae437993c57f7b27930816f9fabdb Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Mon, 15 Apr 2024 15:14:59 +1000 Subject: [PATCH 1/2] add client info to disconnect message Signed-off-by: Sally MacFarlane --- .../eth/manager/EthProtocolManager.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java index 364b2925224..6a01718c7d2 100644 --- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java @@ -425,16 +425,17 @@ public void handleDisconnect( final PeerConnection connection, final DisconnectReason reason, final boolean initiatedByPeer) { - if (ethPeers.registerDisconnect(connection)) { - LOG.atDebug() - .setMessage("Disconnect - {} - {} - {} - {} peers left") - .addArgument(initiatedByPeer ? "Inbound" : "Outbound") - .addArgument(reason::toString) - .addArgument(() -> connection.getPeer().getLoggableId()) - .addArgument(ethPeers::peerCount) - .log(); - LOG.atTrace().setMessage("{}").addArgument(ethPeers::toString).log(); - } + final boolean wasActiveConnection = ethPeers.registerDisconnect(connection); + LOG.atDebug() + .setMessage("Disconnect - active Connection? {} - {} - {} - {} {} - {} peers left") + .addArgument(wasActiveConnection) + .addArgument(initiatedByPeer ? "Inbound" : "Outbound") + .addArgument(reason::toString) + .addArgument(() -> connection.getPeer().getLoggableId()) + .addArgument(() -> connection.getPeerInfo().getClientId()) + .addArgument(ethPeers::peerCount) + .log(); + LOG.atTrace().setMessage("{}").addArgument(ethPeers::toString).log(); } private void handleStatusMessage(final EthPeer peer, final Message message) { From d40348f31d35932437ea338b25387d90a6504d62 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Tue, 16 Apr 2024 21:26:20 +1000 Subject: [PATCH 2/2] exclude disconnect reason message since it makes it harder to analyse Signed-off-by: Sally MacFarlane --- .../besu/ethereum/eth/manager/EthProtocolManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java index 6a01718c7d2..df1ee33d480 100644 --- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java +++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java @@ -427,10 +427,11 @@ public void handleDisconnect( final boolean initiatedByPeer) { final boolean wasActiveConnection = ethPeers.registerDisconnect(connection); LOG.atDebug() - .setMessage("Disconnect - active Connection? {} - {} - {} - {} {} - {} peers left") + .setMessage("Disconnect - active Connection? {} - {} - {} {} - {} {} - {} peers left") .addArgument(wasActiveConnection) .addArgument(initiatedByPeer ? "Inbound" : "Outbound") - .addArgument(reason::toString) + .addArgument(reason::getValue) + .addArgument(reason::name) .addArgument(() -> connection.getPeer().getLoggableId()) .addArgument(() -> connection.getPeerInfo().getClientId()) .addArgument(ethPeers::peerCount)