svn commit: r822628 - /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestProgressTracker.java

[bd...@apache.org]

Author: bdelacretaz
Date: Wed Oct  7 09:13:15 2009
New Revision: 822628

URL: http://svn.apache.org/viewvc?rev=822628&view=rev
Log:
SLING-1139 - Add structure to SlingRequestProgressTracker messages

Modified:
    sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestProgressTracker.java

Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestProgressTracker.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestProgressTracker.java?rev=822628&r1=822627&r2=822628&view=diff
==============================================================================
--- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestProgressTracker.java (original)
+++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/request/SlingRequestProgressTracker.java Wed Oct  7 09:13:15 2009
@@ -103,6 +103,15 @@
      * process.
      */
     private static final String REQUEST_PROCESSING_TIMER = "Request Processing";
+    
+    /** Prefix for "start timer" messages, to make them parseable */
+    public static final String TIMER_START = "TIMER_START|";
+    
+    /** Prefix for "end timer" messages, to make them parseable */
+    public static final String TIMER_END = "TIMER_END|";
+
+    /** Prefix for "elapsed time" */
+    public static final String TIMER_ELAPSED = "TIMER_ELAPSED";
 
     /**
      * The system time at creation of this instance or the last {@link #reset()}.
@@ -218,37 +227,39 @@
         long timer = System.currentTimeMillis();
         namedTimerEntries.put(name, timer);
 
-        log(timer, "Starting " + name);
+        log(timer, TIMER_START + name);
 
         return timer;
     }
 
     /**
      * Logs an entry with the message set to the name of the timer and the
-     * number of milliseconds ellapsed since the timer start.
+     * number of milliseconds elapsed since the timer start.
      */
     public void logTimer(String name) {
         if (namedTimerEntries.containsKey(name)) {
-            long timer = namedTimerEntries.get(name);
-            long currentTime = System.currentTimeMillis();
-            log(currentTime, name + ", elapsed = " + (currentTime - timer)
-                + "ms");
+            logTimerInternal(name, null, namedTimerEntries.get(name));
         }
     }
 
     public void logTimer(String name, String format, Object... args) {
         if (namedTimerEntries.containsKey(name)) {
-            long timer = namedTimerEntries.get(name);
-            long currentTime = System.currentTimeMillis();
-            String message = MessageFormat.format(format, args);
-            log(currentTime, message + ", elapsed = " + (currentTime - timer)
-                + "ms");
+            logTimerInternal(name, MessageFormat.format(format, args), namedTimerEntries.get(name));
+        }
+    }
+    
+    private void logTimerInternal(String name, String msg, long timer) {
+        final long currentTime = System.currentTimeMillis();
+        String info = name;
+        if(msg != null) {
+            info += "|" + msg;
         }
+        log(currentTime, TIMER_END + info + "|" + TIMER_ELAPSED + "=" + (currentTime - timer) + " msec");
     }
     
     public void done() {
         if(done) return;
-        logTimer(REQUEST_PROCESSING_TIMER, REQUEST_PROCESSING_TIMER + " ends");
+        logTimer(REQUEST_PROCESSING_TIMER, REQUEST_PROCESSING_TIMER);
         done = true;
     }