Fixed error reporting for acl exceptions

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index cb09a24..82896f0 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -862,8 +862,6 @@ sub execute {
                 chomp $error;
                 $error = qq/Caught exception "$error"/;
             }
-
-            $c->log->error($error);
             $c->error($error);
             $c->state(0);
         }
@@ -880,6 +878,10 @@ Finalize request.
 sub finalize {
     my $c = shift;
 
+    for my $error ( @{ $c->error } ) {
+        $c->log->error($error);
+    }
+
     $c->finalize_uploads;
 
     # Error

diff --git a/t/live/lib/TestApp.pm b/t/live/lib/TestApp.pm
index 4ab30c3..594dfa3 100644 (file)
--- a/t/live/lib/TestApp.pm
+++ b/t/live/lib/TestApp.pm
@@ -12,7 +12,7 @@ TestApp->setup;
 
 sub index : Private {
     my ( $self, $c ) = @_;
-    $c->res->body( 'root index' );
+    $c->res->body('root index');
 }
 
 sub global_action : Private {
@@ -20,7 +20,6 @@ sub global_action : Private {
     $c->forward('TestApp::View::Dump::Request');
 }
 
-
 sub execute {
     my $c      = shift;
     my $class  = ref( $c->component( $_[0] ) ) || $_[0];
@@ -38,7 +37,6 @@ sub execute {
         $method = $action;
     }
 
-
     if ( $class && $method && $method !~ /^_/ ) {
         my $executed = sprintf( "%s->%s", $class, $method );
         my @executed = $c->response->headers->header('X-Catalyst-Executed');
@@ -52,4 +50,8 @@ sub execute {
     return $c->SUPER::execute(@_);
 }
 
+{
+    no warnings 'redefine';
+    sub Catalyst::Log::error { }
+}
 1;