X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FLog.pm;h=a5992848b329a674b411060830e754db54faeef7;hp=ee9a7e50f06bd5dd8e64819e9e8e07147bcce892;hb=807303a1658f895c41417beba24d24ff9b71c194;hpb=66ef16798266544a462bc6f0250cc693caec47ed diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm old mode 100755 new mode 100644 index ee9a7e5..a599284 --- a/lib/Catalyst/Log.pm +++ b/lib/Catalyst/Log.pm @@ -108,9 +108,8 @@ sub _log { my $self = shift; my $level = shift; my $message = join( "\n", @_ ); - my $ret; if ($self->can('_has_psgi_logger') and $self->_has_psgi_logger) { - $ret = $self->_psgi_logger->({ + $self->_psgi_logger->({ level => $level, message => $message, }); @@ -118,12 +117,12 @@ sub _log { $message .= "\n" unless $message =~ /\n$/; my $body = $self->_body; $body .= sprintf( "[%s] %s", $level, $message ); - $ret = $self->_body($body); + $self->_body($body); } if( $self->autoflush && !$self->abort ) { $self->_flush; } - return $ret; + return 1; } sub _flush { @@ -142,6 +141,7 @@ sub _send_to_log { if ($self->can('_has_psgi_errors') and $self->_has_psgi_errors) { $self->_psgi_errors->print(@_); } else { + binmode STDERR, ":utf8"; print STDERR @_; } }