svn commit: r1368589 - in /incubator/oozie/trunk: core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java release-log.txt

[tu...@apache.org]

Author: tucu
Date: Thu Aug  2 16:31:00 2012
New Revision: 1368589

URL: http://svn.apache.org/viewvc?rev=1368589&view=rev
Log:
OOZIE-886 Display request header info when trace is enabled (jay7306 via tucu)

Modified:
    incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
    incubator/oozie/trunk/release-log.txt

Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java?rev=1368589&r1=1368588&r2=1368589&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java Thu Aug  2 16:31:00 2012
@@ -39,11 +39,7 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.security.AccessControlException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 
 /**
@@ -282,6 +278,11 @@ public abstract class JsonRestServlet ex
             String user = getUser(request);
             TOTAL_REQUESTS_SAMPLER_COUNTER.incrementAndGet();
             samplerCounter.incrementAndGet();
+            //If trace is enabled then display the request headers
+            XLog log = XLog.getLog(getClass());
+            if (log.isTraceEnabled()){
+             logHeaderInfo(request);
+            }
             super.service(request, response);
         }
         catch (XServletException ex) {
@@ -323,6 +324,20 @@ public abstract class JsonRestServlet ex
         }
     }
 
+    private void logHeaderInfo(HttpServletRequest request){
+        XLog log = XLog.getLog(getClass());
+        StringBuilder traceInfo = new StringBuilder(4096);
+            //Display request URL and request.getHeaderNames();
+            Enumeration<String> names = (Enumeration<String>) request.getHeaderNames();
+            traceInfo.append("Request URL: ").append(getRequestUrl(request)).append("\nRequest Headers:\n");
+            while (names.hasMoreElements()) {
+                String name = names.nextElement();
+                String value = request.getHeader(name);
+                traceInfo.append(name).append(" : ").append(value).append("\n");
+            }
+            log.trace(traceInfo);
+    }
+
     private String getRequestUrl(HttpServletRequest request) {
         StringBuffer url = request.getRequestURL();
         if (request.getQueryString() != null) {

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1368589&r1=1368588&r2=1368589&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Thu Aug  2 16:31:00 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.3.0 release (trunk - unreleased)
 
+OOZIE-886 Display request header info when trace is enabled (jay7306 via tucu)
 OOZIE-932 space needed between "Created" and "Nominal time" in oozieCLI output (egashira via virag) 
 OOZIE-903 Workflow action status 'Ok' but the workflow job remains in 'RUNNING' (virag)
 OOZIE-928 Clarify the documentation for submitting coordinator jobs using web services API (rkanter via virag)