commit c6dad281d70457a496b993fbd1fa90f528df963c
author Chetan Mehrotra <chetanm@apache.org> Mon Feb 15 13:59:06 2016 +0000
committer Chetan Mehrotra <chetanm@apache.org> Mon Feb 15 13:59:06 2016 +0000
tree f6ae144c6ce9523d12bcca4218f401fa6a0b1e77
parent 7065d836f13864894982d869e449d6e562f87e4b

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/contrib/extensions/tracer@1730532 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/tracer/internal/JSONRecording.java

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 @@
         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 @@
         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();