[Yanel-commits] rev 60721 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2011-09-14 21:44:02 +0200 (Wed, 14 Sep 2011)
New Revision: 60721

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
check whether a request should be tracked refactored

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-09-14 19:40:22 UTC (rev 60720)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-09-14 19:44:02 UTC (rev 60721)
@@ -2039,14 +2039,9 @@
 
         // INFO: Check if viewable resource has already created a response
         if (!view.isResponse()) {
-            // TODO: Replace with logAccessIsApplicable(view.getMimeType())
-            if(logAccessEnabled) {
-                if (view.getMimeType() != null) {
-                    if (isMimeTypeOk(view.getMimeType())) {
-                        //log.debug("Mime type '" + view.getMimeType() + "' of request: " + request.getServletPath() + "?" + request.getQueryString());
-                        doLogAccess(request, response, res, trackInfo);
-                    }
-                }
+            if(logAccessIsApplicable(view.getMimeType())) {
+                //log.debug("Mime type '" + view.getMimeType() + "' of request: " + request.getServletPath() + "?" + request.getQueryString());
+                doLogAccess(request, response, res, trackInfo);
             }
             return response;
         }
@@ -2076,13 +2071,9 @@
             }
         }
 
-        if(logAccessEnabled) {
-            if (mimeType != null) {
-                if (isMimeTypeOk(mimeType)) {
-                    //log.debug("Mime type '" + mimeType + "' of request: " + request.getServletPath() + "?" + request.getQueryString());
-                    doLogAccess(request, response, res, trackInfo);
-                }
-            }
+        if(logAccessIsApplicable(mimeType)) {
+            //log.debug("Mime type '" + mimeType + "' of request: " + request.getServletPath() + "?" + request.getQueryString());
+            doLogAccess(request, response, res, trackInfo);
         }
 
         // Set HTTP headers:
@@ -2932,11 +2923,18 @@
      */
     private boolean logAccessIsApplicable(String mimeType) {
         if(logAccessEnabled) {
+            // TODO: Check whether resource is trackable
             if (mimeType != null) {
                 if (isMimeTypeOk(mimeType)) {
                     return true;
+                } else {
+                   //log.debug("Do not track this mime type: " + mimeType);
                 }
+            } else {
+                //log.debug("No mime type, hence do not track.");
             }
+        } else {
+            //log.debug("Tracking disabled globally.");
         }
         return false;
     }