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/11/04 18:41:59 UTC
svn commit: r1712596 - in
/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/io:
IoNetworkTransport.java IoReceiver.java IoSender.java
Author: kwall
Date: Wed Nov 4 17:41:58 2015
New Revision: 1712596
URL: http://svn.apache.org/viewvc?rev=1712596&view=rev
Log:
QPID-6818: [Java Client] Include local socket address too
Allows the client logs to be reconciled with the broker log more easily.
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=1712596&r1=1712595&r2=1712596&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 Wed Nov 4 17:41:58 2015
@@ -90,9 +90,9 @@ public class IoNetworkTransport
InetSocketAddress socketAddress = new InetSocketAddress(address, settings.getPort());
socket.connect(socketAddress, settings.getConnectTimeout());
- LOGGER.debug("Socket connection to {} established. Local port {}",
- socket.getRemoteSocketAddress(),
- socket.getLocalPort());
+ LOGGER.debug("Socket connection from {} to {} established",
+ socket.getLocalSocketAddress(),
+ socket.getRemoteSocketAddress());
}
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=1712596&r1=1712595&r2=1712596&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 Wed Nov 4 17:41:58 2015
@@ -79,8 +79,8 @@ final class IoReceiver implements Runnab
throw new RuntimeException("Error creating IOReceiver thread",e);
}
receiverThread.setDaemon(true);
- receiverThread.setName(String.format("IoRcvr-%d-%s",
- socket.getLocalPort(),
+ receiverThread.setName(String.format("IoRcvr-%s-%s",
+ socket.getLocalSocketAddress(),
socket.getRemoteSocketAddress()));
}
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=1712596&r1=1712595&r2=1712596&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 Wed Nov 4 17:41:58 2015
@@ -62,7 +62,7 @@ public final class IoSender implements R
private final AtomicBoolean closed = new AtomicBoolean(false);
private final Thread senderThread;
private IoReceiver _receiver;
- private final String _remoteSocketAddress;
+ private final String _socketEndpointDescription;
private static final boolean shutdownBroken;
static
@@ -77,7 +77,7 @@ public final class IoSender implements R
this.socket = socket;
this.buffer = new byte[pof2(bufferSize)]; // buffer size must be a power of 2
this.timeout = timeout;
- _remoteSocketAddress = socket.getRemoteSocketAddress().toString();
+ _socketEndpointDescription = String.format("%s-%s", socket.getLocalSocketAddress(), socket.getRemoteSocketAddress());
try
{
@@ -99,7 +99,7 @@ public final class IoSender implements R
}
senderThread.setDaemon(true);
- senderThread.setName(String.format("IoSndr-%d-%s", socket.getLocalPort(), _remoteSocketAddress));
+ senderThread.setName(String.format("IoSndr-%s", _socketEndpointDescription));
}
public void initiate()
@@ -123,7 +123,8 @@ public final class IoSender implements R
if(!senderThread.isAlive())
{
- throw new SenderException(String.format("sender thread for socket %s is not alive", _remoteSocketAddress));
+ throw new SenderException(String.format("sender thread for socket %s is not alive",
+ _socketEndpointDescription));
}
final int size = buffer.length;
@@ -160,8 +161,10 @@ public final class IoSender implements R
{
try
{
- LOGGER.error("write timed out for socket {}: head {}, tail {}", _remoteSocketAddress, head, tail);
- throw new SenderException(String.format("write timed out for socket %s: head %d, tail %d", _remoteSocketAddress, head, tail));
+ LOGGER.error("write timed out for socket {}: head {}, tail {}",
+ _socketEndpointDescription, head, tail);
+ throw new SenderException(String.format("write timed out for socket %s: head %d, tail %d",
+ _socketEndpointDescription, head, tail));
}
finally
{
@@ -249,7 +252,7 @@ public final class IoSender implements R
}
catch(RuntimeException e)
{
- LOGGER.error("Exception closing receiver for socket {}", _remoteSocketAddress, e);
+ LOGGER.error("Exception closing receiver for socket {}", _socketEndpointDescription, e);
throw new SenderException(e.getMessage(), e);
}
}
@@ -311,7 +314,7 @@ public final class IoSender implements R
}
catch (IOException e)
{
- LOGGER.info("Exception in thread sending to '{}' : {}", _remoteSocketAddress, e.getMessage());
+ LOGGER.info("Exception in thread sending for socket '{}' : {}", _socketEndpointDescription, e.getMessage());
exception = e;
close(false, false);
break;
@@ -353,13 +356,15 @@ public final class IoSender implements R
senderThread.join(timeout);
if (senderThread.isAlive())
{
- LOGGER.error("join timed out for socket {} to stop", _remoteSocketAddress);
- throw new SenderException(String.format("join timed out for socket %s to stop", _remoteSocketAddress));
+ LOGGER.error("join timed out for socket {} to stop", _socketEndpointDescription);
+ throw new SenderException(String.format("join timed out for socket %s to stop",
+ _socketEndpointDescription));
}
}
catch (InterruptedException e)
{
- LOGGER.error("interrupted whilst waiting for sender thread for socket {} to stop", _remoteSocketAddress);
+ LOGGER.error("interrupted whilst waiting for sender thread for socket {} to stop",
+ _socketEndpointDescription);
throw new SenderException(e);
}
}
@@ -369,7 +374,7 @@ public final class IoSender implements R
{
if (closed.get())
{
- throw new SenderClosedException(String.format("sender for socket %s is closed", _remoteSocketAddress), exception);
+ throw new SenderClosedException(String.format("sender for socket %s is closed", _socketEndpointDescription), exception);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org