You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ch...@apache.org on 2016/02/09 11:39:50 UTC
svn commit: r1729354 - in /sling/trunk/contrib/extensions/tracer/src:
main/java/org/apache/sling/tracer/internal/
test/java/org/apache/sling/tracer/internal/
Author: chetanm
Date: Tue Feb 9 10:39:49 2016
New Revision: 1729354
URL: http://svn.apache.org/viewvc?rev=1729354&view=rev
Log:
SLING-5459 - Recording of tracer logs
Pass logger level also
Modified:
sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java
sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/LogTracer.java
sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/Recording.java
sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/TracerContext.java
sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java
Modified: sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java?rev=1729354&r1=1729353&r2=1729354&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java (original)
+++ sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java Tue Feb 9 10:39:49 2016
@@ -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]);
Modified: sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/LogTracer.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/LogTracer.java?rev=1729354&r1=1729353&r2=1729354&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/LogTracer.java (original)
+++ sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/LogTracer.java Tue Feb 9 10:39:49 2016
@@ -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;
}
}
Modified: sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/Recording.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/Recording.java?rev=1729354&r1=1729353&r2=1729354&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/Recording.java (original)
+++ sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/Recording.java Tue Feb 9 10:39:49 2016
@@ -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
Modified: sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/TracerContext.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/TracerContext.java?rev=1729354&r1=1729353&r2=1729354&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/TracerContext.java (original)
+++ sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/TracerContext.java Tue Feb 9 10:39:49 2016
@@ -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]);
Modified: sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java?rev=1729354&r1=1729353&r2=1729354&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java (original)
+++ sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java Tue Feb 9 10:39:49 2016
@@ -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);