From 6e1f92a05bee26a04cccb4bab5ba62937dffc970 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Mon, 1 Feb 2016 19:26:21 +0100 Subject: [PATCH] Improve loggings --- .../src/main/java/io/bitsquare/p2p/network/Connection.java | 4 ++-- .../main/java/io/bitsquare/p2p/peers/PeerExchangeManager.java | 2 +- network/src/main/java/io/bitsquare/p2p/peers/PeerManager.java | 4 ++-- .../main/java/io/bitsquare/p2p/peers/RequestDataManager.java | 2 +- .../main/java/io/bitsquare/p2p/storage/P2PDataStorage.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/network/src/main/java/io/bitsquare/p2p/network/Connection.java b/network/src/main/java/io/bitsquare/p2p/network/Connection.java index cfe429216c..5fc8491c62 100644 --- a/network/src/main/java/io/bitsquare/p2p/network/Connection.java +++ b/network/src/main/java/io/bitsquare/p2p/network/Connection.java @@ -485,14 +485,14 @@ public class Connection implements MessageListener { shutDownReason = ConnectionListener.Reason.RESET; } else if (e instanceof SocketTimeoutException || e instanceof TimeoutException) { shutDownReason = ConnectionListener.Reason.TIMEOUT; - log.debug("TimeoutException at socket " + socket.toString() + " on connection={}" + this); + log.debug("TimeoutException at socket " + socket.toString() + "\n\tconnection={}" + this); } else if (e instanceof EOFException) { shutDownReason = ConnectionListener.Reason.PEER_DISCONNECTED; } else if (e instanceof NoClassDefFoundError || e instanceof ClassNotFoundException) { shutDownReason = ConnectionListener.Reason.INCOMPATIBLE_DATA; } else { shutDownReason = ConnectionListener.Reason.UNKNOWN; - log.warn("Unknown reason for exception at socket {} on connection={}\n\tException=", + log.warn("Unknown reason for exception at socket {}\n\tconnection={}\n\tException=", socket.toString(), this, e.getMessage()); e.printStackTrace(); } diff --git a/network/src/main/java/io/bitsquare/p2p/peers/PeerExchangeManager.java b/network/src/main/java/io/bitsquare/p2p/peers/PeerExchangeManager.java index 34421c9ea1..4a4f8199a2 100644 --- a/network/src/main/java/io/bitsquare/p2p/peers/PeerExchangeManager.java +++ b/network/src/main/java/io/bitsquare/p2p/peers/PeerExchangeManager.java @@ -109,7 +109,7 @@ public class PeerExchangeManager implements MessageListener, ConnectionListener new PeerExchangeHandshake.Listener() { @Override public void onComplete() { - log.trace("PeerExchangeHandshake of inbound connection complete. Connection={}", connection); + log.trace("PeerExchangeHandshake of inbound connection complete.\n\tConnection={}", connection); } @Override diff --git a/network/src/main/java/io/bitsquare/p2p/peers/PeerManager.java b/network/src/main/java/io/bitsquare/p2p/peers/PeerManager.java index 9e85f75a41..af233e5ef7 100644 --- a/network/src/main/java/io/bitsquare/p2p/peers/PeerManager.java +++ b/network/src/main/java/io/bitsquare/p2p/peers/PeerManager.java @@ -209,7 +209,7 @@ public class PeerManager implements ConnectionListener, MessageListener { candidates.sort((o1, o2) -> o1.getLastActivityDate().compareTo(o2.getLastActivityDate())); log.info("Candidates.size() for shut down=" + candidates.size()); Connection connection = candidates.remove(0); - log.info("We are going to shut down the oldest connection. connection=" + connection.toString()); + log.info("We are going to shut down the oldest connection.\n\tconnection=" + connection.toString()); connection.shutDown(() -> checkMaxConnections(limit)); return true; } else { @@ -251,7 +251,7 @@ public class PeerManager implements ConnectionListener, MessageListener { candidates.sort((o1, o2) -> o1.getLastActivityDate().compareTo(o2.getLastActivityDate())); log.info("Number of connections exceeding MAX_CONNECTIONS_EXTENDED_1. Current size=" + candidates.size()); Connection connection = candidates.remove(0); - log.info("We are going to shut down the oldest connection. connection=" + connection.toString()); + log.info("We are going to shut down the oldest connection.\n\tconnection=" + connection.toString()); connection.shutDown(this::removeSuperfluousSeedNodes); } } diff --git a/network/src/main/java/io/bitsquare/p2p/peers/RequestDataManager.java b/network/src/main/java/io/bitsquare/p2p/peers/RequestDataManager.java index 2bace60b88..a066bb8078 100644 --- a/network/src/main/java/io/bitsquare/p2p/peers/RequestDataManager.java +++ b/network/src/main/java/io/bitsquare/p2p/peers/RequestDataManager.java @@ -119,7 +119,7 @@ public class RequestDataManager implements MessageListener { new RequestDataHandshake.Listener() { @Override public void onComplete() { - log.trace("requestDataHandshake of inbound connection complete. Connection={}", + log.trace("requestDataHandshake of inbound connection complete.\n\tConnection={}", connection); } diff --git a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java index 7bc4407ef8..5d1738c29a 100644 --- a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java +++ b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java @@ -104,7 +104,7 @@ public class P2PDataStorage implements MessageListener { public void onMessage(Message message, Connection connection) { if (message instanceof DataBroadcastMessage) { Log.traceCall(message.toString() + "\n\tconnection=" + connection); - log.trace("DataBroadcastMessage received " + message + " on connection " + connection); + log.trace("DataBroadcastMessage received " + message + "\n\tconnection " + connection); connection.getPeersNodeAddressOptional().ifPresent(peersNodeAddress -> { if (message instanceof AddDataMessage) { add(((AddDataMessage) message).data, peersNodeAddress);