Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r537205 -
 /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java
Date: Fri, 11 May 2007 15:11:41 -0000
To: cvs@cocoon.apache.org
From: vgritsenko@apache.org
Message-Id: <20070511151141.9AFA71A9838@eris.apache.org>

Author: vgritsenko
Date: Fri May 11 08:11:40 2007
New Revision: 537205

URL: http://svn.apache.org/viewvc?view=rev&rev=537205
Log:
fix error handling: correct error message, log exceptions.
fix regression in logging: restore access logger.

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java?view=diff&rev=537205&r1=537204&r2=537205
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java Fri May 11 08:11:40 2007
@@ -94,15 +94,17 @@
         this.servletSettings = new ServletSettings(this.settings);
 
         final String encoding = this.settings.getContainerEncoding();
-        if ( encoding == null ) {
+        if (encoding == null) {
             this.containerEncoding = "ISO-8859-1";
         } else {
             this.containerEncoding = encoding;
         }
 
-        this.log = (Logger) this.cocoonBeanFactory.getBean(AvalonUtils.LOGGER_ROLE);
+        // Obtain access logger
+        // FIXME This used to be configurable via "servlet-logger" parameter in web.xml
+        this.log = ((Logger) this.cocoonBeanFactory.getBean(AvalonUtils.LOGGER_ROLE)).getChildLogger("access");
 
-        this.processor = this.getProcessor();
+        this.processor = getProcessor();
         this.environmentContext = new HttpContext(this.servletContext);
         // get the optional request listener
         if (this.cocoonBeanFactory.containsBean(RequestListener.ROLE)) {
@@ -111,7 +113,7 @@
     }
 
     protected Processor getProcessor() {
-        return (Processor)this.cocoonBeanFactory.getBean(Processor.ROLE);
+        return (Processor) this.cocoonBeanFactory.getBean(Processor.ROLE);
     }
 
     public void setProcessor(Processor processor) {
@@ -139,7 +141,7 @@
 
         // We got it... Process the request
         final String uri = getURI(request, res);
-        if ( uri == null ) {
+        if (uri == null) {
             // a redirect occured, so we are finished
             return;
         }
@@ -251,7 +253,7 @@
                 show = !showTime.equalsIgnoreCase("no");
             }
             if (show) {
-                if ( timeString == null ) {
+                if (timeString == null) {
                     timeString = processTime(stopWatch.getTime());
                 }
                 boolean hide = this.servletSettings.isHideShowTime();
@@ -348,18 +350,17 @@
                 try {
                     requestListener.onRequestStart(environment);
                 } catch (Exception e) {
-                    this.log.error("Error encountered monitoring request start: "
-                            + e.getMessage());
+                    getLogger().error("Error encountered monitoring request start", e);
                 }
             }
+
             result = this.processor.process(environment);
 
             if (this.requestListener != null) {
                 try {
                     requestListener.onRequestEnd(environment);
                 } catch (Exception e) {
-                    this.log.error("Error encountered monitoring request start: "
-                            + e.getMessage());
+                    getLogger().error("Error encountered monitoring request end",  e);
                 }
             }
 
@@ -372,18 +373,17 @@
                 try {
                     requestListener.onRequestException(environment, any);
                 } catch (Exception e) {
-                    this.log.error("Error encountered monitoring request start: "
-                            + e.getMessage());
+                    getLogger().error("Error encountered monitoring request exception", e);
                 }
             }
+
             // reset response on error
             environment.tryResetResponse();
             throw any;
         } finally {
             EnvironmentHelper.leaveProcessor();
             environment.finishingProcessing();
-
-            EnvironmentHelper.checkEnvironment(environmentDepth, this.getLogger());
+            EnvironmentHelper.checkEnvironment(environmentDepth, getLogger());
         }
     }
 }