Repository: incubator-usergrid Updated Branches: refs/heads/two-dot-o-events 717eb15d5 -> 43105f126
Added output logging so uncaught exceptions or illegal input is logged for analysis Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a93b1e3e Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a93b1e3e Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a93b1e3e Branch: refs/heads/two-dot-o-events Commit: a93b1e3e445d124a180df3ba4672e44949c036fc Parents: 66ab376 Author: Todd Nine <[email protected]> Authored: Mon Nov 17 14:48:13 2014 -0700 Committer: Todd Nine <[email protected]> Committed: Mon Nov 17 14:48:13 2014 -0700 ---------------------------------------------------------------------- stack/corepersistence/pom.xml | 2 +- .../rest/exceptions/IllegalArgumentExceptionMapper.java | 8 ++++++++ .../usergrid/rest/exceptions/ThrowableMapper.java | 12 ++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a93b1e3e/stack/corepersistence/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml index b44fca7..9bd53fa 100644 --- a/stack/corepersistence/pom.xml +++ b/stack/corepersistence/pom.xml @@ -59,7 +59,7 @@ limitations under the License. <commons.collections.version>3.2.1</commons.collections.version> <commons.io.version>2.4</commons.io.version> <commons.lang.version>3.1</commons.lang.version> - <elasticsearch.version>1.4.0</elasticsearch.version> + <elasticsearch.version>1.3.2</elasticsearch.version> <fasterxml-uuid.version>3.1.3</fasterxml-uuid.version> <guava.version>15.0</guava.version> <guice.version>4.0-beta5</guice.version> http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a93b1e3e/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/IllegalArgumentExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/IllegalArgumentExceptionMapper.java b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/IllegalArgumentExceptionMapper.java index 582ee95..ff7b656 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/IllegalArgumentExceptionMapper.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/IllegalArgumentExceptionMapper.java @@ -20,14 +20,22 @@ package org.apache.usergrid.rest.exceptions; import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import static javax.ws.rs.core.Response.Status.BAD_REQUEST; @Provider public class IllegalArgumentExceptionMapper extends AbstractExceptionMapper<IllegalArgumentException> { + private static final Logger logger = LoggerFactory.getLogger(IllegalArgumentExceptionMapper.class); + @Override public Response toResponse( IllegalArgumentException e ) { + + logger.error( "Illegal argument was passed, returning bad request to user", e ); + return toResponse( BAD_REQUEST, e ); } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a93b1e3e/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/ThrowableMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/ThrowableMapper.java b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/ThrowableMapper.java index 818e775..5bf1fbe 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/ThrowableMapper.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/exceptions/ThrowableMapper.java @@ -17,11 +17,23 @@ package org.apache.usergrid.rest.exceptions; +import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** Will map to HTTP 500 INTERNAL_SERVER_ERROR because parent does */ @Provider public class ThrowableMapper extends AbstractExceptionMapper<Throwable> { + private static final Logger logger = LoggerFactory.getLogger( ThrowableMapper.class ); + + @Override + public Response toResponse( final Throwable throwable ) { + logger.error( "An uncaught exception occurred during HTTP invocation", throwable ); + + return super.toResponse( throwable ); + } }
