X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FLog.pm;h=382a3e97180af108d01b5f8bcf335300d8337c8b;hb=0eb98ebd1624e8181a4bd88c26605f2a0f1c91d7;hp=b035d893914f8b89977a4db102926256a5ebe0be;hpb=0816209f4514031fe62bdc63d8663ea5a4d1bbda;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm
index b035d89..382a3e9 100644
--- 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.