Remove full method path and line breaks from messages

rsksmart · Oct 30, 2023 · c829cd0 · c829cd0
1 parent d50a43e
commit c829cd0
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 116 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/net/discovery/DiscoveryEvent.java b/rskj-core/src/main/java/co/rsk/net/discovery/DiscoveryEvent.java
@@ -43,8 +43,8 @@ public InetSocketAddress getAddress() {
     @Override
     public String toString() {
         return new ToStringBuilder(this)
-                .append("message", this.message.toString())
-                .append("address", this.address.toString())
+                .append("message", this.message)
+                .append("address", this.address)
                 .toString();
     }
 }
diff --git a/rskj-core/src/main/java/co/rsk/net/discovery/NodeChallengeManager.java b/rskj-core/src/main/java/co/rsk/net/discovery/NodeChallengeManager.java
@@ -36,9 +36,7 @@ public class NodeChallengeManager {
     private Map<String, NodeChallenge> activeChallenges = new ConcurrentHashMap<>();
 
     public NodeChallenge startChallenge(Node challengedNode, Node challenger, PeerExplorer explorer) {
-        logger.debug("co.rsk.net.discovery.NodeChallengeManager.startChallenge - Starting challenge for node:\n" +
-                "challengedNode: {}\n" +
-                "challenger: {}", challengedNode.toString(), challenger.toString());
+        logger.debug("startChallenge - Starting challenge for node: [{}] by challenger: [{}]", challengedNode.toString(), challenger.toString());
 
         PingPeerMessage pingMessage = explorer.sendPing(challengedNode.getAddress(), 1, challengedNode);
         String messageId = pingMessage.getMessageId();

diff --git a/rskj-core/src/main/java/co/rsk/net/discovery/PeerDiscoveryRequest.java b/rskj-core/src/main/java/co/rsk/net/discovery/PeerDiscoveryRequest.java
@@ -79,9 +79,9 @@ public boolean hasExpired() {
     public String toString() {
         return new ToStringBuilder(this)
                 .append("messageId", this.messageId)
-                .append("message", this.message.toString())
-                .append("address", this.address.toString())
-                .append("relatedNode", this.relatedNode == null ? null : this.relatedNode.toString())
+                .append("message", this.message)
+                .append("address", this.address)
+                .append("relatedNode", this.relatedNode)
                 .toString();
     }
 }