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 0f6b00b336e61e99a15298f765ee1e252a1d3947 Author: Chetan Mehrotra <[email protected]> AuthorDate: Tue Feb 9 10:40:25 2016 +0000 SLING-5459 - Recording of tracer logs Preparing for supporting 2 logs - RequestProgressTracker and actual logs. Change the name to `requestProgressLogs` for logs from RequestProgressTracker. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1729355 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/sling/tracer/internal/JSONRecording.java | 2 +- src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java | 2 +- src/test/java/org/apache/sling/tracer/internal/LogTracerTest.java | 2 +- .../java/org/apache/sling/tracer/internal/TracerLogServletTest.java | 2 +- 4 files changed, 4 insertions(+), 4 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 179194c..0b103bd 100644 --- a/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java +++ b/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java @@ -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 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 f5ed681..f7c1736 100644 --- a/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java +++ b/src/test/java/org/apache/sling/tracer/internal/JSONRecordingTest.java @@ -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()); } } diff --git a/src/test/java/org/apache/sling/tracer/internal/LogTracerTest.java b/src/test/java/org/apache/sling/tracer/internal/LogTracerTest.java index e23ac13..1409f95 100644 --- a/src/test/java/org/apache/sling/tracer/internal/LogTracerTest.java +++ b/src/test/java/org/apache/sling/tracer/internal/LogTracerTest.java @@ -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()); } diff --git a/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java b/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java index d2090fe..5514dd1 100644 --- a/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java +++ b/src/test/java/org/apache/sling/tracer/internal/TracerLogServletTest.java @@ -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 -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
