mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 06:55:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement reviewer suggestions also in NetworkNode

Browse source
This commit is contained in:
Christoph Sturm 2019-09-06 11:57:15 +02:00 • committed by Christoph Atteneder
parent 3666ed2911
commit 372ff50b8b
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
p2p/src/main/java/bisq/network/p2p/network/Connection.java
View file

@ -704,10 +704,9 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
long now = System.currentTimeMillis();
long elapsed = now - lastReadTimeStamp;
if (elapsed < 10) {
if (log.isDebugEnabled())
log.debug("We got 2 network_messages received in less than 10 ms. We set the thread to sleep " +
"for 20 ms to avoid getting flooded by our peer. lastReadTimeStamp={}, now={}, elapsed={}",
lastReadTimeStamp, now, elapsed);
log.debug("We got 2 network_messages received in less than 10 ms. We set the thread to sleep " +
"for 20 ms to avoid getting flooded by our peer. lastReadTimeStamp={}, now={}, elapsed={}",
lastReadTimeStamp, now, elapsed);
Thread.sleep(20);
}
@ -725,9 +724,7 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
NetworkEnvelope networkEnvelope = networkProtoResolver.fromProto(proto);
lastReadTimeStamp = now;
if (log.isDebugEnabled())
log.debug("<< Received networkEnvelope of type: " + networkEnvelope.getClass().getSimpleName());
log.debug("<< Received networkEnvelope of type: {}", networkEnvelope.getClass().getSimpleName());
int size = proto.getSerializedSize();
// We comment out that part as only debug and trace log level is used. For debugging purposes
// we leave the code though.
@ -763,8 +760,9 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
boolean exceeds;
if (networkEnvelope instanceof ExtendedDataSizePermission) {
exceeds = size > MAX_PERMITTED_MESSAGE_SIZE;
if (log.isDebugEnabled())
if (log.isDebugEnabled()) {
log.debug("size={}; object={}", size, Utilities.toTruncatedString(proto, 100));
}
} else {
exceeds = size > PERMITTED_MESSAGE_SIZE;
}
@ -822,9 +820,10 @@ public class Connection implements HasCapabilities, Runnable, MessageListener {
if (networkEnvelope instanceof CloseConnectionMessage) {
// If we get a CloseConnectionMessage we shut down
if (log.isDebugEnabled())
if (log.isDebugEnabled()) {
log.debug("CloseConnectionMessage received. Reason={}\n\t" +
"connection={}", proto.getCloseConnectionMessage().getReason(), this);
"connection={}", proto.getCloseConnectionMessage().getReason(), this);
}
if (CloseConnectionReason.PEER_BANNED.name().equals(proto.getCloseConnectionMessage().getReason())) {
log.warn("We got shut down because we are banned by the other peer. (InputHandler.run CloseConnectionMessage)");
shutDown(CloseConnectionReason.PEER_BANNED);

25
p2p/src/main/java/bisq/network/p2p/network/NetworkNode.java
View file

@ -98,8 +98,9 @@ public abstract class NetworkNode implements MessageListener {
public SettableFuture<Connection> sendMessage(@NotNull NodeAddress peersNodeAddress,
NetworkEnvelope networkEnvelope) {
if (log.isDebugEnabled())
if (log.isDebugEnabled()) {
log.debug("sendMessage: peersNodeAddress=" + peersNodeAddress + "\n\tmessage=" + Utilities.toTruncatedString(networkEnvelope));
}
checkNotNull(peersNodeAddress, "peerAddress must not be null");
Connection connection = getOutboundConnection(peersNodeAddress);
@ -124,13 +125,15 @@ public abstract class NetworkNode implements MessageListener {
try {
// can take a while when using tor
long startTs = System.currentTimeMillis();
if (log.isDebugEnabled())
if (log.isDebugEnabled()) {
log.debug("Start create socket to peersNodeAddress {}", peersNodeAddress.getFullAddress());
}
Socket socket = createSocket(peersNodeAddress);
long duration = System.currentTimeMillis() - startTs;
if (log.isDebugEnabled())
if (log.isDebugEnabled()) {
log.debug("Socket creation to peersNodeAddress {} took {} ms", peersNodeAddress.getFullAddress(),
duration);
}
if (duration > CREATE_SOCKET_TIMEOUT)
throw new TimeoutException("A timeout occurred when creating a socket.");
@ -142,12 +145,14 @@ public abstract class NetworkNode implements MessageListener {
existingConnection = getOutboundConnection(peersNodeAddress);
if (existingConnection != null) {
if (log.isDebugEnabled())
if (log.isDebugEnabled()) {
log.debug("We found in the meantime a connection for peersNodeAddress {}, " +
"so we use that for sending the message.\n" +
"That can happen if Tor needs long for creating a new outbound connection.\n" +
"We might have got a new inbound or outbound connection.",
peersNodeAddress.getFullAddress());
"so we use that for sending the message.\n" +
"That can happen if Tor needs long for creating a new outbound connection.\n" +
"We might have got a new inbound or outbound connection.",
peersNodeAddress.getFullAddress());
}
try {
socket.close();
} catch (Throwable throwable) {
@ -188,7 +193,7 @@ public abstract class NetworkNode implements MessageListener {
peersNodeAddress,
networkProtoResolver);
if (log.isDebugEnabled())
if (log.isDebugEnabled()) {
log.debug("\n\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" +
"NetworkNode created new outbound connection:"
+ "\nmyNodeAddress=" + getNodeAddress()
@ -196,7 +201,7 @@ public abstract class NetworkNode implements MessageListener {
+ "\nuid=" + outboundConnection.getUid()
+ "\nmessage=" + networkEnvelope
+ "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n");
}
// can take a while when using tor
outboundConnection.sendMessage(networkEnvelope);
return outboundConnection;