Skip to content

Commit

Permalink
Implement reviewer suggestions also in NetworkNode
Browse files Browse the repository at this point in the history
  • Loading branch information
@christophsturm @ripcurlx
christophsturm authored and ripcurlx committed Sep 6, 2019
1 parent 3666ed2 commit 372ff50
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 20 deletions.
19 changes: 9 additions & 10 deletions p2p/src/main/java/bisq/network/p2p/network/Connection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,10 +704,9 @@ public void run() {
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);
}

Expand All @@ -725,9 +724,7 @@ public void run() {

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.
Expand Down Expand Up @@ -763,8 +760,9 @@ public void run() {
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;
}
Expand Down Expand Up @@ -822,9 +820,10 @@ && reportInvalidRequest(RuleViolation.WRONG_NETWORK_ID)) {

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);
Expand Down
25 changes: 15 additions & 10 deletions p2p/src/main/java/bisq/network/p2p/network/NetworkNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -124,13 +125,15 @@ public SettableFuture<Connection> sendMessage(@NotNull NodeAddress peersNodeAddr
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.");
Expand All @@ -142,12 +145,14 @@ public SettableFuture<Connection> sendMessage(@NotNull NodeAddress peersNodeAddr
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) {
Expand Down Expand Up @@ -188,15 +193,15 @@ public void onError(Throwable throwable) {
peersNodeAddress,
networkProtoResolver);

if (log.isDebugEnabled())
if (log.isDebugEnabled()) {
log.debug("\n\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" +
"NetworkNode created new outbound connection:"
+ "\nmyNodeAddress=" + getNodeAddress()
+ "\npeersNodeAddress=" + peersNodeAddress
+ "\nuid=" + outboundConnection.getUid()
+ "\nmessage=" + networkEnvelope
+ "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n");

}
// can take a while when using tor
outboundConnection.sendMessage(networkEnvelope);
return outboundConnection;
Expand Down

0 comments on commit 372ff50

Please sign in to comment.