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

[michi at wyona.com]

Author: michi
Date: 2011-09-07 09:25:34 +0200 (Wed, 07 Sep 2011)
New Revision: 60490

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
logging improved

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-07 07:09:22 UTC (rev 60489)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-09-07 07:25:34 UTC (rev 60490)
@@ -2132,7 +2132,8 @@
                                 }
                             } catch (Exception e) {
                                 String message = "Error merging toolbar into content: " + e.getMessage();
-                                log.error(message, e);
+                                //log.error(message, e);
+                                log.error(e, e);
                                 Element exceptionElement = (Element) doc.getDocumentElement().appendChild(doc.createElementNS(NAMESPACE, "exception"));
                                 exceptionElement.appendChild(doc.createTextNode(message));
                                 response.setStatus(javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
@@ -2670,7 +2671,9 @@
                 if (remoteIPAddr != null) {
                     accessLogMessage = accessLogMessage + AccessLog.encodeLogField("ip", remoteIPAddr);
                 } else {
-                    log.warn("No such request header: X-FORWARDED-FOR (hence fallback to request.getRemoteAddr())"); // INFO: For example in the case of AJP
+                    if (log.isDebugEnabled()) {
+                        log.debug("No such request header: X-FORWARDED-FOR (hence fallback to request.getRemoteAddr())"); // INFO: For example in the case of AJP
+                    }
                     accessLogMessage = accessLogMessage + AccessLog.encodeLogField("ip", request.getRemoteAddr());
                 }
             } else {