First stab at a solution

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 8386639..2367139 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -543,6 +543,7 @@ Populate the context object from the request object.
 
 sub prepare_request {
     my ($self, $ctx, %args) = @_;
+    $ctx->log->psgienv($args{env}) if $ctx->log->can('psgienv');
     $ctx->request->_set_env($args{env});
     $self->_set_env($args{env}); # Nasty back compat!
     $ctx->response->_set_response_cb($args{response_cb});

diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm
index b035d89..382a3e9 100644 (file)
--- a/lib/Catalyst/Log.pm
+++ b/lib/Catalyst/Log.pm
@@ -13,6 +13,7 @@ our %LEVEL_MATCH = (); # Stored as additive, thus debug = 31, warn = 30 etc
 has level => (is => 'rw');
 has _body => (is => 'rw');
 has abort => (is => 'rw');
+has psgienv => (is => 'rw', predicate => 'has_psgienv', clearer => 'clear_psgienv');
 
 {
     my @levels = qw[ debug info warn error fatal ];
@@ -92,9 +93,16 @@ sub _log {
     my $level   = shift;
     my $message = join( "\n", @_ );
     $message .= "\n" unless $message =~ /\n$/;
-    my $body = $self->_body;
-    $body .= sprintf( "[%s] %s", $level, $message );
-    $self->_body($body);
+    if ($self->can('has_psgienv') and $self->has_psgienv and $self->psgienv->{'psgix.logger'}) {
+        $self->psgienv->{'psgix.logger'}->({
+                level => $level,
+                message => $message,
+            });
+    } else {
+        my $body = $self->_body;
+        $body .= sprintf( "[%s] %s", $level, $message );
+        $self->_body($body);
+    }
 }
 
 sub _flush {
@@ -110,7 +118,11 @@ sub _flush {
 
 sub _send_to_log {
     my $self = shift;
-    print STDERR @_;
+    if ($self->can('has_psgienv') and $self->has_psgienv) {
+        $self->psgienv->{'psgi.errors'}->print(@_);
+    } else {
+        print STDERR @_;
+    }
 }
 
 # 5.7 compat code.

diff --git a/t/lib/TestApp/View/Dump.pm b/t/lib/TestApp/View/Dump.pm
index afbc0eb..43cc976 100644 (file)
--- a/t/lib/TestApp/View/Dump.pm
+++ b/t/lib/TestApp/View/Dump.pm
@@ -39,6 +39,10 @@ sub process {
     # Remove context from reference if needed
     my $context = delete $reference->{_context};
 
+    if (my $log = $reference->{_log}) {
+        $log->clear_psgienv if $log->can('psgienv');
+    }
+
     if ( my $output =
         $self->dump( $reference, $purity ) )
     {