This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tracer.git
commit b2f2cb2f100da8a63a78b1e6a85e86924fb36224 Author: Chetan Mehrotra <[email protected]> AuthorDate: Tue Feb 9 10:39:49 2016 +0000 SLING-5459 - Recording of tracer logs Pass logger level also git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1729354 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/sling/tracer/internal/JSONRecording.java | 3 ++- src/main/java/org/apache/sling/tracer/internal/LogTracer.java | 2 +- src/main/java/org/apache/sling/tracer/internal/Recording.java | 5 +++-- src/main/java/org/apache/sling/tracer/internal/TracerContext.java | 4 ++-- .../java/org/apache/sling/tracer/internal/JSONRecordingTest.java | 5 +++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java b/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java index 9c8340e..179194c 100644 --- a/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java +++ b/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java @@ -28,6 +28,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; +import ch.qos.logback.classic.Level; import org.apache.sling.api.request.RequestProgressTracker; import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.io.JSONWriter; @@ -58,7 +59,7 @@ class JSONRecording implements Recording { //~---------------------------------------< Recording > @Override - public void log(String logger, String format, Object[] params) { + public void log(Level level, String logger, String format, Object[] params) { if (TracerContext.QUERY_LOGGER.equals(logger) && params != null && params.length == 2) { queries.add((String) params[1]); diff --git a/src/main/java/org/apache/sling/tracer/internal/LogTracer.java b/src/main/java/org/apache/sling/tracer/internal/LogTracer.java index 9489671..94c220c 100644 --- a/src/main/java/org/apache/sling/tracer/internal/LogTracer.java +++ b/src/main/java/org/apache/sling/tracer/internal/LogTracer.java @@ -384,7 +384,7 @@ public class LogTracer { if (format == null) { return FilterReply.ACCEPT; } - if (tracer.log(logger.getName(), format, params)) { + if (tracer.log(level, logger.getName(), format, params)) { return FilterReply.ACCEPT; } } diff --git a/src/main/java/org/apache/sling/tracer/internal/Recording.java b/src/main/java/org/apache/sling/tracer/internal/Recording.java index 1e6f058..7e24f14 100644 --- a/src/main/java/org/apache/sling/tracer/internal/Recording.java +++ b/src/main/java/org/apache/sling/tracer/internal/Recording.java @@ -19,12 +19,13 @@ package org.apache.sling.tracer.internal; +import ch.qos.logback.classic.Level; import org.apache.sling.api.request.RequestProgressTracker; interface Recording { Recording NOOP = new Recording() { @Override - public void log(String logger, String format, Object[] params) { + public void log(Level level, String logger, String format, Object[] params) { } @@ -39,7 +40,7 @@ interface Recording { } }; - void log(String logger, String format, Object[] params); + void log(Level level, String logger, String format, Object[] params); /** * Register the {@link RequestProgressTracker} associated with diff --git a/src/main/java/org/apache/sling/tracer/internal/TracerContext.java b/src/main/java/org/apache/sling/tracer/internal/TracerContext.java index 5755ca8..4931255 100644 --- a/src/main/java/org/apache/sling/tracer/internal/TracerContext.java +++ b/src/main/java/org/apache/sling/tracer/internal/TracerContext.java @@ -80,8 +80,8 @@ class TracerContext { return false; } - public boolean log(String logger, String format, Object[] params) { - recording.log(logger, format, params); + public boolean log(Level level, String logger, String format, Object[] params) { + recording.log(level, logger, format, params); if (QUERY_LOGGER.equals(logger) && params != null && params.length == 2) { return logQuery((String) params[1]); diff --git a/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java b/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java index 9ebd544..f5ed681 100644 --- a/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java +++ b/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java @@ -23,6 +23,7 @@ import java.io.StringWriter; import javax.servlet.http.HttpServletRequest; +import ch.qos.logback.classic.Level; import org.apache.sling.commons.json.JSONObject; import org.junit.Test; @@ -40,8 +41,8 @@ public class JSONRecordingTest { when(request.getMethod()).thenReturn("GET"); JSONRecording r = new JSONRecording("abc", request); - r.log(TracerContext.QUERY_LOGGER, "foo bar", new Object[]{"x" , "y"}); - r.log(TracerContext.QUERY_LOGGER, "foo bar", new Object[]{"x" , "z"}); + r.log(Level.INFO, TracerContext.QUERY_LOGGER, "foo bar", new Object[]{"x" , "y"}); + r.log(Level.INFO, TracerContext.QUERY_LOGGER, "foo bar", new Object[]{"x" , "z"}); r.done(); r.render(sw); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
