[Bigdata-commit] SF.net SVN: bigdata:[8130] branches/RDR/bigdata-sails/src/java/com/bigdata/ rdf/sail/webapp

[<tho...@us...>]

Revision: 8130
          http://sourceforge.net/p/bigdata/code/8130
Author:   thompsonbry
Date:     2014-04-21 14:33:56 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Added logging to RESTServlet.

Javadoc inside of QueryServlet.

Modified Paths:
--------------
    branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
    branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RESTServlet.java

Modified: branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
===================================================================
--- branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java	2014-04-21 14:33:06 UTC (rev 8129)
+++ branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java	2014-04-21 14:33:56 UTC (rev 8130)
@@ -148,6 +148,11 @@
     protected void doPost(final HttpServletRequest req,
             final HttpServletResponse resp) throws IOException {
 
+        /*
+         * Note: HALoadBalancerServlet MUST be maintained if idempotent methods
+         * are added to doPost() in order to ensure that they are load balanced
+         * rather than always directed to the quorum leader.
+         */
 
         if (req.getParameter(ATTR_UPDATE) != null) {
             

Modified: branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RESTServlet.java
===================================================================
--- branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RESTServlet.java	2014-04-21 14:33:06 UTC (rev 8129)
+++ branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RESTServlet.java	2014-04-21 14:33:56 UTC (rev 8130)
@@ -30,6 +30,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.log4j.Logger;
 import org.openrdf.model.URI;
 import org.openrdf.model.impl.URIImpl;
 
@@ -42,8 +43,8 @@
  */
 public class RESTServlet extends BigdataRDFServlet {
 
-//    private static final transient Logger log = Logger
-//            .getLogger(RESTServlet.class);
+    private static final transient Logger log = Logger
+            .getLogger(RESTServlet.class);
 
     /**
      * 
@@ -137,6 +138,9 @@
     protected void doGet(final HttpServletRequest req,
             final HttpServletResponse resp) throws IOException {
 
+        if (log.isInfoEnabled())
+            log.info(req.toString());
+        
         /*
          * Look for linked data GET requests.
          * 
@@ -201,7 +205,10 @@
     protected void doPost(final HttpServletRequest req,
             final HttpServletResponse resp) throws IOException {
     	
-		if (req.getParameter(QueryServlet.ATTR_QUERY) != null
+        if (log.isInfoEnabled())
+            log.info(req.toString());
+
+        if (req.getParameter(QueryServlet.ATTR_QUERY) != null
                 || req.getParameter(QueryServlet.ATTR_UPDATE) != null
                 || req.getParameter(QueryServlet.ATTR_UUID) != null
                 || req.getParameter(QueryServlet.ATTR_ESTCARD) != null
@@ -249,9 +256,14 @@
 
 	}
 
-	static boolean hasMimeType(final HttpServletRequest req, String mimeType) {
-		String contentType = req.getContentType();
-		return contentType != null &&  mimeType.equals(new MiniMime(contentType).getMimeType());
+    static boolean hasMimeType(final HttpServletRequest req,
+            final String mimeType) {
+
+        final String contentType = req.getContentType();
+        
+        return contentType != null
+                && mimeType.equals(new MiniMime(contentType).getMimeType());
+        
 	}
 
     /**
@@ -264,6 +276,9 @@
     protected void doPut(final HttpServletRequest req,
             final HttpServletResponse resp) throws IOException {
 
+        if (log.isInfoEnabled())
+            log.info(req.toString());
+
         m_updateServlet.doPut(req, resp);
 
     }
@@ -275,6 +290,9 @@
     protected void doDelete(final HttpServletRequest req,
             final HttpServletResponse resp) throws IOException {
 
+        if (log.isInfoEnabled())
+            log.info(req.toString());
+
         m_deleteServlet.doDelete(req, resp);
 
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.