You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/02/19 11:10:19 UTC
svn commit: r1447653 - in /tomee/tomee/trunk/server:
openejb-client/src/main/java/org/apache/openejb/client/
openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/
openejb-http/src/main/java/org/apache/openejb/server/httpd/
Author: rmannibucau
Date: Tue Feb 19 10:10:18 2013
New Revision: 1447653
URL: http://svn.apache.org/r1447653
Log:
OPENEJB-1998 basic structure to get remote ip, request size and response size when calling ejbd server
Modified:
tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIRequest.java
tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java
tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServerServlet.java
Modified: tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIRequest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIRequest.java?rev=1447653&r1=1447652&r2=1447653&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIRequest.java (original)
+++ tomee/tomee/trunk/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIRequest.java Tue Feb 19 10:10:18 2013
@@ -99,10 +99,9 @@ public class JNDIRequest implements Clus
StringBuilder sb = new StringBuilder(100);
sb.append(requestMethod);
- sb.append(this.moduleId).append(":");
+ sb.append(this.moduleId != null ? moduleId : "").append(":");
sb.append(this.requestString);
return sb.toString();
}
-
}
Modified: tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java?rev=1447653&r1=1447652&r2=1447653&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java Tue Feb 19 10:10:18 2013
@@ -30,6 +30,7 @@ import org.apache.openejb.spi.ContainerS
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import javax.servlet.http.HttpServletRequest;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
@@ -37,7 +38,9 @@ import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
+import java.net.InetSocketAddress;
import java.net.Socket;
+import java.net.SocketAddress;
import java.rmi.RemoteException;
import java.util.Properties;
import java.util.zip.GZIPInputStream;
@@ -45,6 +48,7 @@ import java.util.zip.GZIPInputStream;
public class EjbDaemon implements org.apache.openejb.spi.ApplicationServer {
private static final ProtocolMetaData PROTOCOL_VERSION = new ProtocolMetaData("3.1");
+ private static final ThreadLocal<RequestInfo> REQUEST_INFO = new ThreadLocal<RequestInfo>();
static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE, "org.apache.openejb.server.util.resources");
@@ -106,6 +110,8 @@ public class EjbDaemon implements org.ap
out = new BufferedOutputStream(new FlushableGZIPOutputStream(socket.getOutputStream()));
}
+ initRequestInfo(socket);
+
service(in, out);
} finally {
@@ -139,12 +145,20 @@ public class EjbDaemon implements org.ap
//Ignore
}
}
+
+ clearRequestInfo();
}
}
- public void service(final InputStream in, final OutputStream out) throws IOException {
+ public void service(final InputStream rawIn, final OutputStream rawOut) throws IOException {
final ProtocolMetaData protocolMetaData = new ProtocolMetaData();
+ final CountingInputStream in = new CountingInputStream(rawIn);
+ final CountingOutputStream out = new CountingOutputStream(rawOut);
+
+ REQUEST_INFO.get().inputStream = in;
+ REQUEST_INFO.get().outputStream = out;
+
ObjectInputStream ois = null;
ObjectOutputStream oos = null;
RequestType requestType = null;
@@ -222,7 +236,6 @@ public class EjbDaemon implements org.ap
logger.warning(msg + " - Debug for StackTrace");
}
} finally {
-
try {
ClientObjectFactory.serverMetaData.remove();
} finally {
@@ -308,5 +321,152 @@ public class EjbDaemon implements org.ap
public boolean isGzip() {
return gzip;
}
+
+ public int currentRequestSize() {
+ final RequestInfo info = REQUEST_INFO.get();
+ if (info == null) {
+ REQUEST_INFO.remove();
+ return 0;
+ }
+ return info.inputStream.getCount();
+ }
+
+ public int currentResponseSize() {
+ final RequestInfo info = REQUEST_INFO.get();
+ if (info == null) {
+ REQUEST_INFO.remove();
+ return 0;
+ }
+ return info.outputStream.getCount();
+ }
+
+ public String currentClientIp() {
+ final RequestInfo info = REQUEST_INFO.get();
+ if (info == null) {
+ REQUEST_INFO.remove();
+ return "?";
+ }
+ return info.ip;
+ }
+
+ public void initRequestInfo(final HttpServletRequest request) {
+ final RequestInfo value = new RequestInfo();
+ value.ip = request.getRemoteAddr();
+ REQUEST_INFO.set(value);
+ }
+
+ public void initRequestInfo(final Socket socket) {
+ final RequestInfo value = forceRequestInfo();
+ final SocketAddress remoteSocketAddress = socket.getRemoteSocketAddress();
+ if (remoteSocketAddress != null && InetSocketAddress.class.isInstance(remoteSocketAddress)) {
+ value.ip = InetSocketAddress.class.cast(remoteSocketAddress).getHostString();
+ }
+ }
+
+ private RequestInfo forceRequestInfo() {
+ RequestInfo value = REQUEST_INFO.get();
+ if (value == null) {
+ value = new RequestInfo();
+ REQUEST_INFO.set(value);
+ }
+ return value;
+ }
+
+ public void clearRequestInfo() {
+ REQUEST_INFO.remove();
+ }
+
+ public static class RequestInfo {
+ public String ip;
+ public CountingInputStream inputStream;
+ public CountingOutputStream outputStream;
+
+ @Override
+ public String toString() {
+ return "RequestInfo{"
+ + "ip='" + ip + '\''
+ + ", request-size=" + inputStream.getCount()
+ + ", response-size=" + outputStream.getCount()
+ + '}';
+ }
+ }
+
+ private static class CountingInputStream extends InputStream {
+ private final InputStream delegate;
+ private int count = 0;
+
+ public CountingInputStream(final InputStream rawIn) {
+ delegate = rawIn;
+ }
+
+ @Override
+ public int read() throws IOException {
+ final int r = delegate.read();
+ if (r == -1) {
+ return -1;
+ }
+
+ count++;
+ return r;
+ }
+
+ @Override
+ public int available() throws IOException {
+ return delegate.available();
+ }
+
+ @Override
+ public void close() throws IOException {
+ delegate.close();
+ }
+
+ @Override
+ public void mark(int readlimit) {
+ delegate.mark(readlimit);
+ }
+
+ @Override
+ public void reset() throws IOException {
+ delegate.reset();
+ }
+
+ @Override
+ public boolean markSupported() {
+ return delegate.markSupported();
+ }
+
+ public int getCount() {
+ return count;
+ }
+ }
+
+ private static class CountingOutputStream extends OutputStream {
+ private final OutputStream delegate;
+ private int count = 0;
+
+ public CountingOutputStream(final OutputStream rawIn) {
+ delegate = rawIn;
+ }
+
+ @Override
+ public void write(final int b) throws IOException {
+ count++;
+ delegate.write(b);
+ }
+
+ @Override
+ public void flush() throws IOException {
+ delegate.flush();
+ }
+
+ @Override
+ public void close() throws IOException {
+ delegate.close();
+ }
+
+ private int getCount() {
+ return count;
+ }
+ }
}
Modified: tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java?rev=1447653&r1=1447652&r2=1447653&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java Tue Feb 19 10:10:18 2013
@@ -124,8 +124,9 @@ class JndiRequestHandler {
if (logger.isDebugEnabled()) {
try {
- logger.debug("JNDI REQUEST: " + req + " -- RESPONSE: " + res);
+ logRequestResponse(req, res);
} catch (Exception ignore) {
+ // no-op
}
}
@@ -158,21 +159,30 @@ class JndiRequestHandler {
res.setResult(new ThrowableArtifact(namingException));
} finally {
- if (logger.isDebugEnabled()) {
- try {
- logger.debug("JNDI REQUEST: " + req + " -- RESPONSE: " + res);
- } catch (Exception ignore) {
- }
- }
-
try {
res.writeExternal(out);
} catch (Throwable e) {
logger.fatal("Couldn't write JndiResponse to output stream", e);
}
+
+ if (logger.isDebugEnabled()) {
+ try {
+ out.flush(); // force it to as correct as possible response size
+ logRequestResponse(req, res);
+ } catch (Exception ignore) {
+ // no-op
+ }
+ }
}
}
+ private void logRequestResponse(final JNDIRequest req, final JNDIResponse res) {
+ final EjbDaemon daemon = EjbDaemon.getEjbDaemon();
+ logger.debug("JNDI REQUEST: " + req + " (size = " + daemon.currentRequestSize()
+ + "b, remote-ip =" + daemon.currentClientIp()
+ + ") -- RESPONSE: " + res + " (size = " + daemon.currentResponseSize() + "b)");
+ }
+
private String getPrefix(JNDIRequest req) throws NamingException {
String prefix;
String name = req.getRequestString();
Modified: tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java?rev=1447653&r1=1447652&r2=1447653&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java Tue Feb 19 10:10:18 2013
@@ -322,8 +322,13 @@ public class KeepAliveServer implements
@Override
public void service(final Socket socket) throws ServiceException, IOException {
- final Session session = new Session(this, socket);
- session.service();
+ final EjbDaemon ejbDaemon = EjbDaemon.getEjbDaemon();
+ ejbDaemon.initRequestInfo(socket);
+ try {
+ new Session(this, socket).service();
+ } finally {
+ ejbDaemon.clearRequestInfo();
+ }
}
@Override
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServerServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServerServlet.java?rev=1447653&r1=1447652&r2=1447653&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServerServlet.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServerServlet.java Tue Feb 19 10:10:18 2013
@@ -19,6 +19,7 @@ package org.apache.openejb.server.httpd;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.server.ServiceException;
+import org.apache.openejb.server.ejbd.EjbDaemon;
import org.apache.openejb.server.ejbd.EjbServer;
import javax.servlet.ServletConfig;
@@ -52,10 +53,14 @@ public class ServerServlet extends HttpS
ServletInputStream in = request.getInputStream();
ServletOutputStream out = response.getOutputStream();
+ final EjbDaemon ejbDaemon = EjbDaemon.getEjbDaemon();
try {
+ ejbDaemon.initRequestInfo(request);
ejbServer.service(in, out);
} catch (ServiceException e) {
throw new ServletException("ServerService error: " + ejbServer.getClass().getName() + " -- " + e.getMessage(), e);
+ } finally {
+ ejbDaemon.clearRequestInfo();
}
}
}