You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/10/30 19:25:12 UTC
svn commit: r1711534 - in
/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io:
IoNetworkTransport.java IoReceiver.java IoSender.java
Author: kwall
Date: Fri Oct 30 18:25:12 2015
New Revision: 1711534
URL: http://svn.apache.org/viewvc?rev=1711534&view=rev
Log:
QPID-6818: [Java Client] Include ephemeral port number in IO sender/receiver thread name and log after TCP/IP connection is formed
Modified:
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java?rev=1711534&r1=1711533&r2=1711534&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java Fri Oct 30 18:25:12 2015
@@ -79,14 +79,21 @@ public class IoNetworkTransport
if (LOGGER.isDebugEnabled())
{
- LOGGER.debug("SO_RCVBUF : " + socket.getReceiveBufferSize());
- LOGGER.debug("SO_SNDBUF : " + socket.getSendBufferSize());
- LOGGER.debug("TCP_NODELAY : " + socket.getTcpNoDelay());
+ LOGGER.debug("Socket options SO_RCVBUF : {}, SO_SNDBUF : {}, TCP_NODELAY : {}",
+ socket.getReceiveBufferSize(),
+ socket.getSendBufferSize(),
+ socket.getTcpNoDelay());
}
InetAddress address = InetAddress.getByName(settings.getHost());
- socket.connect(new InetSocketAddress(address, settings.getPort()), settings.getConnectTimeout());
+ InetSocketAddress socketAddress = new InetSocketAddress(address, settings.getPort());
+ socket.connect(socketAddress, settings.getConnectTimeout());
+
+ LOGGER.debug("Socket connection to {} established. Local port {}",
+ socket.getRemoteSocketAddress(),
+ socket.getLocalPort());
+
}
catch (IOException e)
{
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java?rev=1711534&r1=1711533&r2=1711534&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java Fri Oct 30 18:25:12 2015
@@ -79,7 +79,9 @@ final class IoReceiver implements Runnab
throw new RuntimeException("Error creating IOReceiver thread",e);
}
receiverThread.setDaemon(true);
- receiverThread.setName(String.format("IoRcvr-%s", socket.getRemoteSocketAddress()));
+ receiverThread.setName(String.format("IoRcvr-%d-%s",
+ socket.getLocalPort(),
+ socket.getRemoteSocketAddress()));
}
public void initiate()
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java?rev=1711534&r1=1711533&r2=1711534&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io/IoSender.java Fri Oct 30 18:25:12 2015
@@ -95,11 +95,11 @@ public final class IoSender implements R
}
catch(Exception e)
{
- throw new Error("Error creating IOSender thread",e);
+ throw new RuntimeException("Error creating IOSender thread", e);
}
senderThread.setDaemon(true);
- senderThread.setName(String.format("IoSndr-%s", _remoteSocketAddress));
+ senderThread.setName(String.format("IoSndr-%d-%s", socket.getLocalPort(), _remoteSocketAddress));
}
public void initiate()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org