Juan Hernandez has uploaded a new change for review. Change subject: restapi: Remove payload logging ......................................................................
restapi: Remove payload logging The infrastructure for payload logging is never used, and it is Resteasy dependent. This patch removes it. Change-Id: I1e845ce56e39936bae5a3bbb792b7a846345f979 Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java D backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/LoggingInputStream.java D backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/LoggingOutputStream.java D backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/MessageLogger.java D backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/RequestPayloadLogger.java D backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/RequestVerbLogger.java D backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/ResponsePayloadLogger.java D backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/ResponseStatusLogger.java 8 files changed, 0 insertions(+), 323 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/30103/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java index 7939d49..5bbbc48 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/BackendApplication.java @@ -28,10 +28,6 @@ import org.ovirt.engine.api.common.invocation.Current; import org.ovirt.engine.api.restapi.logging.MessageBundle; import org.ovirt.engine.api.restapi.logging.Messages; -import org.ovirt.engine.api.restapi.logging.RequestPayloadLogger; -import org.ovirt.engine.api.restapi.logging.RequestVerbLogger; -import org.ovirt.engine.api.restapi.logging.ResponsePayloadLogger; -import org.ovirt.engine.api.restapi.logging.ResponseStatusLogger; import org.ovirt.engine.api.restapi.resource.BackendApiResource; import org.ovirt.engine.api.restapi.resource.BackendBookmarksResource; import org.ovirt.engine.api.restapi.resource.BackendCapabilitiesResource; @@ -153,12 +149,6 @@ processor.setCurrent(current); processor.setSessionHelper(sessionHelper); singletons.add(processor); - - // Logging infrastructure: - singletons.add(new RequestVerbLogger()); - singletons.add(new RequestPayloadLogger()); - singletons.add(new ResponseStatusLogger()); - singletons.add(new ResponsePayloadLogger()); // Intercepter that maps exceptions cause by illegal guid string to 400 status (BAD_REQUEST). singletons.add(new MalformedIdExceptionMapper()); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/LoggingInputStream.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/LoggingInputStream.java deleted file mode 100644 index 532ef26..0000000 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/LoggingInputStream.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.ovirt.engine.api.restapi.logging; - -import java.io.IOException; -import java.io.InputStream; - -import org.ovirt.engine.core.utils.log.Log; - -public class LoggingInputStream extends InputStream { - - protected InputStream wrapped; - protected Log log; - protected StringBuilder line; - - protected LoggingInputStream(InputStream wrapped, Log log) { - this.wrapped = wrapped; - this.log = log; - line = new StringBuilder(); - } - - @Override - public int available() throws IOException { - return wrapped.available(); - } - - @Override - public void close() throws IOException { - wrapped.close(); - } - - @Override - public void mark(int readlimit) { - wrapped.mark(readlimit); - } - - @Override - public boolean markSupported() { - return wrapped.markSupported(); - } - - @Override - public synchronized int read(byte[] bytes) throws IOException { - return read(bytes, 0, bytes.length); - } - - @Override - public synchronized int read(byte[] bytes, int offset, int length) throws IOException { - int count = wrapped.read(bytes, offset, length); - if (count > 0) { - String b = new String(bytes, offset, count); - line.append(b); - if (b.indexOf('\n') != -1) { - dump(); - } - } - return count; - } - - @Override - public synchronized int read() throws IOException { - int c = wrapped.read(); - line.append((char)c); - if (c == '\n') { - dump(); - } - return c; - } - - @Override - public void reset() throws IOException { - wrapped.reset(); - } - - @Override - public long skip(long n) throws IOException { - return wrapped.skip(n); - } - - protected void dump() { - log.debug(line.toString()); - line = new StringBuilder(); - } -} diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/LoggingOutputStream.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/LoggingOutputStream.java deleted file mode 100644 index 7cbab91..0000000 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/LoggingOutputStream.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.ovirt.engine.api.restapi.logging; - -import java.io.IOException; -import java.io.OutputStream; - -import org.ovirt.engine.core.utils.log.Log; - -public class LoggingOutputStream extends OutputStream { - - protected OutputStream wrapped; - protected Log log; - protected StringBuilder line; - - protected LoggingOutputStream(OutputStream wrapped, Log log) { - this.wrapped = wrapped; - this.log = log; - line = new StringBuilder(); - } - - @Override - public void write(int c) throws IOException { - line.append((char)c); - if (c == '\n') { - dump(); - } - wrapped.write(c); - } - - @Override - public void write(byte[] bytes) throws IOException { - write(bytes, 0, bytes.length); - } - - @Override - public void write(byte[] bytes, int offset, int length) throws IOException { - String b = new String(bytes, offset, length); - line.append(b); - if (b.indexOf('\n') != -1) { - dump(); - } - wrapped.write(bytes, offset, length); - } - - @Override - public void flush() throws IOException { - dump(); - wrapped.flush(); - } - - @Override - public void close() throws IOException { - dump(); - // wrapped stream will be independently closed - } - - protected void dump() { - log(line.toString()); - line = new StringBuilder(); - } - - protected void log(String line) { - log.debug(line); - } -} diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/MessageLogger.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/MessageLogger.java deleted file mode 100644 index 0f2f482..0000000 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/MessageLogger.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.ovirt.engine.api.restapi.logging; - -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; - -public class MessageLogger { - - protected static final Log LOG = LogFactory.getLog(MessageLogger.class); - -} diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/RequestPayloadLogger.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/RequestPayloadLogger.java deleted file mode 100644 index c78c1a8..0000000 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/RequestPayloadLogger.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.ovirt.engine.api.restapi.logging; - -import java.io.IOException; -import java.io.InputStream; -import java.util.List; -import java.util.Map.Entry; - -import javax.ws.rs.ext.Provider; -import javax.ws.rs.WebApplicationException; - -import org.jboss.resteasy.annotations.interception.DecoderPrecedence; -import org.jboss.resteasy.annotations.interception.ServerInterceptor; -import org.jboss.resteasy.spi.interception.MessageBodyReaderContext; -import org.jboss.resteasy.spi.interception.MessageBodyReaderInterceptor; - -@Provider -@ServerInterceptor -@DecoderPrecedence -public class RequestPayloadLogger extends MessageLogger implements MessageBodyReaderInterceptor { - - @Override - public Object read(MessageBodyReaderContext context) throws IOException, WebApplicationException { - InputStream old = context.getInputStream(); - if (LOG.isDebugEnabled()) { - logHeaders(context); - context.setInputStream(new LoggingInputStream(old, LOG)); - } - try { - return context.proceed(); - } finally { - context.setInputStream(old); - } - } - - protected void logHeaders(MessageBodyReaderContext context) { - for (Entry<String, List<String>> entry : context.getHeaders().entrySet()) { - StringBuilder header = new StringBuilder(entry.getKey()); - header.append(":"); - for (String value : entry.getValue()) { - header.append(value).append(" "); - } - LOG.debug(header); - } - } -} diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/RequestVerbLogger.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/RequestVerbLogger.java deleted file mode 100644 index a7f7594..0000000 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/RequestVerbLogger.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.ovirt.engine.api.restapi.logging; - -import javax.ws.rs.ext.Provider; -import javax.ws.rs.WebApplicationException; - -import org.jboss.resteasy.annotations.interception.DecoderPrecedence; -import org.jboss.resteasy.annotations.interception.ServerInterceptor; -import org.jboss.resteasy.core.ResourceMethod; -import org.jboss.resteasy.core.ServerResponse; -import org.jboss.resteasy.spi.Failure; -import org.jboss.resteasy.spi.HttpRequest; -import org.jboss.resteasy.spi.interception.PreProcessInterceptor; - -@Provider -@ServerInterceptor -@DecoderPrecedence -public class RequestVerbLogger extends MessageLogger implements PreProcessInterceptor { - - @Override - public ServerResponse preProcess(HttpRequest request, ResourceMethod method) throws Failure, WebApplicationException { - if (LOG.isDebugEnabled()) { - logVerb(request); - } - return null; - } - - protected void logVerb(HttpRequest request) { - LOG.debug(request.getHttpMethod() + " " + request.getUri().getRequestUri()); - } -} diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/ResponsePayloadLogger.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/ResponsePayloadLogger.java deleted file mode 100644 index a503e56..0000000 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/ResponsePayloadLogger.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.ovirt.engine.api.restapi.logging; - -import java.io.IOException; -import java.io.OutputStream; -import java.util.List; -import java.util.Map; - -import javax.ws.rs.ext.Provider; -import javax.ws.rs.WebApplicationException; - -import org.jboss.resteasy.annotations.interception.DecoderPrecedence; -import org.jboss.resteasy.annotations.interception.ServerInterceptor; -import org.jboss.resteasy.spi.interception.MessageBodyWriterContext; -import org.jboss.resteasy.spi.interception.MessageBodyWriterInterceptor; - -@Provider -@ServerInterceptor -@DecoderPrecedence -public class ResponsePayloadLogger extends MessageLogger implements MessageBodyWriterInterceptor { - - @Override - public void write(MessageBodyWriterContext context) throws IOException, WebApplicationException { - OutputStream old = context.getOutputStream(), wrapper = null; - if (LOG.isDebugEnabled()) { - logHeaders(context); - wrapper = new LoggingOutputStream(old, LOG); - context.setOutputStream(wrapper); - } - - try { - context.proceed(); - } finally { - if (wrapper != null) { - try { - wrapper.close(); - } catch (IOException ioe) { - // never thrown - } - context.setOutputStream(old); - } - } - } - - protected void logHeaders(MessageBodyWriterContext context) { - for (Map.Entry<String, List<Object>> entry : context.getHeaders().entrySet()) { - StringBuilder header = new StringBuilder(entry.getKey()); - header.append(":"); - for (Object value : entry.getValue()) { - header.append(value).append(" "); - } - LOG.debug(header); - } - } - -} diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/ResponseStatusLogger.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/ResponseStatusLogger.java deleted file mode 100644 index f17c309..0000000 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/logging/ResponseStatusLogger.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.ovirt.engine.api.restapi.logging; - -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - -import org.jboss.resteasy.annotations.interception.DecoderPrecedence; -import org.jboss.resteasy.annotations.interception.ServerInterceptor; -import org.jboss.resteasy.core.ServerResponse; -import org.jboss.resteasy.spi.interception.PostProcessInterceptor; - -@Provider -@ServerInterceptor -@DecoderPrecedence -public class ResponseStatusLogger extends MessageLogger implements PostProcessInterceptor { - - @Override - public void postProcess(ServerResponse response) { - if (LOG.isDebugEnabled()) { - logStatus(response); - } - } - - protected void logStatus(ServerResponse response) { - LOG.debug(response.getStatus() + " " + Response.Status.fromStatusCode(response.getStatus())); - } -} - -- To view, visit http://gerrit.ovirt.org/30103 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e845ce56e39936bae5a3bbb792b7a846345f979 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
