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 d6f506f04c111adc6267d2593b189ac9c55d68da Author: Chetan Mehrotra <[email protected]> AuthorDate: Mon Feb 15 13:59:06 2016 +0000 SLING-5459 - Recording of tracer logs Trim the request progress logs as they have extra space at starting and a new line feed at end git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1730532 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/tracer/internal/JSONRecording.java | 27 ++++++++++++++-------- 1 file changed, 17 insertions(+), 10 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 a319a45..a88a250 100644 --- a/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java +++ b/src/main/java/org/apache/sling/tracer/internal/JSONRecording.java @@ -174,16 +174,7 @@ class JSONRecording implements Recording, Comparable<JSONRecording> { jw.key("time").value(timeTaken); jw.key("timestamp").value(start); - if (tracker != null) { - jw.key("requestProgressLogs"); - jw.array(); - Iterator<String> it = tracker.getMessages(); - //Per docs iterator can be null - while (it != null && it.hasNext()) { - jw.value(it.next()); - } - jw.endArray(); - } + addRequestProgressLogs(jw); queryCollector.done(); addJson(jw, "queries", queries); @@ -195,6 +186,22 @@ class JSONRecording implements Recording, Comparable<JSONRecording> { return baos.toByteArray(); } + private void addRequestProgressLogs(JSONWriter jw) throws JSONException { + if (tracker != null) { + jw.key("requestProgressLogs"); + jw.array(); + Iterator<String> it = tracker.getMessages(); + //Per docs iterator can be null + while (it != null && it.hasNext()) { + String entry = it.next(); + if (entry != null){ + jw.value(entry.trim()); + } + } + jw.endArray(); + } + } + private void addJson(JSONWriter jw, String name, List<? extends JsonEntry> entries) throws JSONException { jw.key(name); jw.array(); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
