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 12:00:46 UTC
svn commit: r1447669 - in /tomee/tomee/trunk/server:
openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/
openejb-http/src/main/java/org/apache/openejb/server/httpd/
openejb-server/src/main/java/org/apache/openejb/server/context/
openejb-server/s...
Author: rmannibucau
Date: Tue Feb 19 11:00:46 2013
New Revision: 1447669
URL: http://svn.apache.org/r1447669
Log:
OPENEJB-1998 slight refactoring to handle request info - shouldn't directly be in EjbDaemon
Added:
tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/
tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java
tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/stream/
tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java
tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java
Modified:
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/OpenEJBHttpServer.java
tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/ServerServlet.java
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=1447669&r1=1447668&r2=1447669&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 11:00:46 2013
@@ -26,11 +26,13 @@ import org.apache.openejb.client.Request
import org.apache.openejb.client.ServerMetaData;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.server.DiscoveryAgent;
+import org.apache.openejb.server.context.RequestInfos;
+import org.apache.openejb.server.stream.CountingInputStream;
+import org.apache.openejb.server.stream.CountingOutputStream;
import org.apache.openejb.spi.ContainerSystem;
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;
@@ -38,10 +40,7 @@ import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
-import java.net.InetAddress;
-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;
@@ -49,7 +48,6 @@ 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");
@@ -111,7 +109,7 @@ public class EjbDaemon implements org.ap
out = new BufferedOutputStream(new FlushableGZIPOutputStream(socket.getOutputStream()));
}
- initRequestInfo(socket);
+ RequestInfos.initRequestInfo(socket);
service(in, out);
} finally {
@@ -147,7 +145,7 @@ public class EjbDaemon implements org.ap
}
}
- clearRequestInfo();
+ RequestInfos.clearRequestInfo();
}
}
@@ -157,8 +155,9 @@ public class EjbDaemon implements org.ap
final CountingInputStream in = new CountingInputStream(rawIn);
final CountingOutputStream out = new CountingOutputStream(rawOut);
- REQUEST_INFO.get().inputStream = in;
- REQUEST_INFO.get().outputStream = out;
+ final RequestInfos.RequestInfo info = RequestInfos.info();
+ info.inputStream = in;
+ info.outputStream = out;
ObjectInputStream ois = null;
ObjectOutputStream oos = null;
@@ -322,158 +321,5 @@ 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)) {
- final InetSocketAddress socketAddress = InetSocketAddress.class.cast(remoteSocketAddress);
- final InetAddress address = socketAddress.getAddress();
- if (address != null) {
- value.ip = address.getHostAddress();
- } else {
- value.ip = socketAddress.getHostName();
- }
- }
- }
-
- 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=1447669&r1=1447668&r2=1447669&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 11:00:46 2013
@@ -44,6 +44,7 @@ import javax.validation.ValidatorFactory
import javax.xml.namespace.QName;
import org.apache.openejb.resource.jdbc.DataSourceFactory;
+import org.apache.openejb.server.context.RequestInfos;
import org.omg.CORBA.ORB;
import static org.apache.openejb.server.ejbd.ClientObjectFactory.convert;
@@ -177,10 +178,10 @@ class JndiRequestHandler {
}
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)");
+ final RequestInfos.RequestInfo info = RequestInfos.info();
+ logger.debug("JNDI REQUEST: " + req + " (size = " + info.inputStream.getCount()
+ + "b, remote-ip =" + info.ip
+ + ") -- RESPONSE: " + res + " (size = " + info.outputStream.getCount() + "b)");
}
private String getPrefix(JNDIRequest req) throws NamingException {
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=1447669&r1=1447668&r2=1447669&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 11:00:46 2013
@@ -22,6 +22,7 @@ import org.apache.openejb.loader.SystemI
import org.apache.openejb.server.ServerService;
import org.apache.openejb.server.ServiceException;
import org.apache.openejb.server.ServicePool;
+import org.apache.openejb.server.context.RequestInfos;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -322,12 +323,11 @@ public class KeepAliveServer implements
@Override
public void service(final Socket socket) throws ServiceException, IOException {
- final EjbDaemon ejbDaemon = EjbDaemon.getEjbDaemon();
- ejbDaemon.initRequestInfo(socket);
+ RequestInfos.initRequestInfo(socket);
try {
new Session(this, socket).service();
} finally {
- ejbDaemon.clearRequestInfo();
+ RequestInfos.clearRequestInfo();
}
}
Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java?rev=1447669&r1=1447668&r2=1447669&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java Tue Feb 19 11:00:46 2013
@@ -20,6 +20,9 @@ import org.apache.openejb.OpenEJBExcepti
import org.apache.openejb.loader.Options;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.server.ServiceException;
+import org.apache.openejb.server.context.RequestInfos;
+import org.apache.openejb.server.stream.CountingInputStream;
+import org.apache.openejb.server.stream.CountingOutputStream;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.OptionsLog;
@@ -95,8 +98,10 @@ public class OpenEJBHttpServer implement
OutputStream out = null;
try {
- in = socket.getInputStream();
- out = socket.getOutputStream();
+ RequestInfos.initRequestInfo(socket);
+
+ in = new CountingInputStream(socket.getInputStream());
+ out = new CountingOutputStream(socket.getOutputStream());
//TODO: if ssl change to https
final URI socketURI = new URI("http://" + socket.getLocalAddress().getHostAddress() + ":" + socket.getLocalPort());
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=1447669&r1=1447668&r2=1447669&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 11:00:46 2013
@@ -19,7 +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.context.RequestInfos;
import org.apache.openejb.server.ejbd.EjbServer;
import javax.servlet.ServletConfig;
@@ -53,14 +53,13 @@ public class ServerServlet extends HttpS
ServletInputStream in = request.getInputStream();
ServletOutputStream out = response.getOutputStream();
- final EjbDaemon ejbDaemon = EjbDaemon.getEjbDaemon();
try {
- ejbDaemon.initRequestInfo(request);
+ RequestInfos.initRequestInfo(request);
ejbServer.service(in, out);
} catch (ServiceException e) {
throw new ServletException("ServerService error: " + ejbServer.getClass().getName() + " -- " + e.getMessage(), e);
} finally {
- ejbDaemon.clearRequestInfo();
+ RequestInfos.clearRequestInfo();
}
}
}
Added: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java?rev=1447669&view=auto
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java (added)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java Tue Feb 19 11:00:46 2013
@@ -0,0 +1,86 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.server.context;
+
+import org.apache.openejb.server.stream.CountingInputStream;
+import org.apache.openejb.server.stream.CountingOutputStream;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+
+public final class RequestInfos {
+ private static final ThreadLocal<RequestInfo> REQUEST_INFO = new ThreadLocal<RequestInfo>();
+
+ private RequestInfos() {
+ // no-op
+ }
+
+ public static void initRequestInfo(final HttpServletRequest request) {
+ final RequestInfo value = new RequestInfo();
+ value.ip = request.getRemoteAddr();
+ REQUEST_INFO.set(value);
+ }
+
+ public static void initRequestInfo(final Socket socket) {
+ final RequestInfo value = forceRequestInfo();
+ final SocketAddress remoteSocketAddress = socket.getRemoteSocketAddress();
+ if (remoteSocketAddress != null && InetSocketAddress.class.isInstance(remoteSocketAddress)) {
+ final InetSocketAddress socketAddress = InetSocketAddress.class.cast(remoteSocketAddress);
+ final InetAddress address = socketAddress.getAddress();
+ if (address != null) {
+ value.ip = address.getHostAddress();
+ } else {
+ value.ip = socketAddress.getHostName();
+ }
+ }
+ }
+
+ public static RequestInfo forceRequestInfo() {
+ RequestInfo value = REQUEST_INFO.get();
+ if (value == null) {
+ value = new RequestInfo();
+ REQUEST_INFO.set(value);
+ }
+ return value;
+ }
+
+ public static void clearRequestInfo() {
+ REQUEST_INFO.remove();
+ }
+
+ public static RequestInfo info() {
+ return REQUEST_INFO.get();
+ }
+
+ 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()
+ + '}';
+ }
+ }
+}
Added: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java?rev=1447669&view=auto
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java (added)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java Tue Feb 19 11:00:46 2013
@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.server.stream;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public 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;
+ }
+}
Added: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java?rev=1447669&view=auto
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java (added)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java Tue Feb 19 11:00:46 2013
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.server.stream;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public 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();
+ }
+
+ public int getCount() {
+ return count;
+ }
+}