You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2008/12/24 11:10:27 UTC
svn commit: r729289 - in
/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon:
Acceptor.java Relay.java
Author: veithen
Date: Wed Dec 24 02:10:26 2008
New Revision: 729289
URL: http://svn.apache.org/viewvc?rev=729289&view=rev
Log:
Testkit: Improved logging in TCP monitor.
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Acceptor.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Relay.java
Modified: webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Acceptor.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Acceptor.java?rev=729289&r1=729288&r2=729289&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Acceptor.java (original)
+++ webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Acceptor.java Wed Dec 24 02:10:26 2008
@@ -51,8 +51,8 @@
}
try {
Socket targetSocket = new Socket(target.getAddress(), target.getPort());
- executorService.execute(new Relay("SENT", socket, targetSocket));
- executorService.execute(new Relay("RECEIVED", targetSocket, socket));
+ executorService.execute(new Relay(socket, targetSocket, false));
+ executorService.execute(new Relay(targetSocket, socket, true));
} catch (IOException ex) {
log.error(ex);
}
Modified: webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Relay.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Relay.java?rev=729289&r1=729288&r2=729289&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Relay.java (original)
+++ webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/tcpmon/Relay.java Wed Dec 24 02:10:26 2008
@@ -32,16 +32,20 @@
class Relay implements Runnable {
private static final Log log = LogFactory.getLog(Relay.class);
- private final String tag;
private final Socket inSocket;
private final InputStream in;
private final OutputStream out;
+ private final String connectionSpec;
- public Relay(String tag, Socket inSocket, Socket outSocket) throws IOException {
- this.tag = tag;
+ public Relay(Socket inSocket, Socket outSocket, boolean isResponse) throws IOException {
this.inSocket = inSocket;
this.in = inSocket.getInputStream();
this.out = outSocket.getOutputStream();
+ if (isResponse) {
+ connectionSpec = outSocket.getRemoteSocketAddress() + " <- " + inSocket.getRemoteSocketAddress();
+ } else {
+ connectionSpec = inSocket.getRemoteSocketAddress() + " -> " + outSocket.getRemoteSocketAddress();
+ }
}
public void run() {
@@ -49,7 +53,7 @@
try {
int n;
while ((n = in.read(buf)) > 0) {
- StringBuilder dump = new StringBuilder(tag);
+ StringBuilder dump = new StringBuilder(connectionSpec);
dump.append('\n');
Utils.hexDump(dump, buf, n);
log.debug(dump);
@@ -64,5 +68,6 @@
IOUtils.closeQuietly(in);
IOUtils.closeQuietly(out);
}
+ log.debug(connectionSpec + ": closed");
}
}