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:40:26 UTC
svn commit: r1729355 - 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:40:25 2016
New Revision: 1729355
URL: http://svn.apache.org/viewvc?rev=1729355&view=rev
Log:
SLING-5459 - Recording of tracer logs
Preparing for supporting 2 logs - RequestProgressTracker and actual logs. Change the name to `requestProgressLogs` for logs from RequestProgressTracker.
Modified:
sling/trunk/contrib/extensions/tracer/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java
sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java
sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/LogTracerTest.java
sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.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=1729355&r1=1729354&r2=1729355&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:40:25 2016
@@ -95,7 +95,7 @@ class JSONRecording implements Recording
jw.key("method").value(method);
if (tracker != null) {
- jw.key("logs");
+ jw.key("requestProgressLogs");
jw.array();
Iterator<String> it = tracker.getMessages();
//Per docs iterator can be null
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=1729355&r1=1729354&r2=1729355&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:40:25 2016
@@ -63,7 +63,7 @@ public class JSONRecordingTest {
r.render(sw);
JSONObject json = new JSONObject(sw.toString());
- assertEquals(2, json.getJSONArray("logs").length());
+ assertEquals(2, json.getJSONArray("requestProgressLogs").length());
}
}
Modified: sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/LogTracerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/LogTracerTest.java?rev=1729355&r1=1729354&r2=1729355&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/LogTracerTest.java (original)
+++ sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/LogTracerTest.java Tue Feb 9 10:40:25 2016
@@ -261,7 +261,7 @@ public class LogTracerTest {
jr.render(sw);
JSONObject json = new JSONObject(sw.toString());
- assertEquals(2, json.getJSONArray("logs").length());
+ assertEquals(2, json.getJSONArray("requestProgressLogs").length());
}
Modified: sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java?rev=1729355&r1=1729354&r2=1729355&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java (original)
+++ sling/trunk/contrib/extensions/tracer/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java Tue Feb 9 10:40:25 2016
@@ -109,7 +109,7 @@ public class TracerLogServletTest {
logServlet.renderContent(request, response);
JSONObject json = new JSONObject(sw.toString());
assertEquals("GET", json.getString("method"));
- assertEquals(2, json.getJSONArray("logs").length());
+ assertEquals(2, json.getJSONArray("requestProgressLogs").length());
}
@Test