X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FLog.pm;h=72ae9363cff70501d3bf58bd5ea9c87a366985a8;hb=08680694151d666fc2f69c54065e2aa09e175742;hp=ee9a7e50f06bd5dd8e64819e9e8e07147bcce892;hpb=66ef16798266544a462bc6f0250cc693caec47ed;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm index ee9a7e5..72ae936 100755 --- a/lib/Catalyst/Log.pm +++ b/lib/Catalyst/Log.pm @@ -66,8 +66,7 @@ around new => sub { my $class = shift; my $self = $class->$orig; - $self->levels( scalar(@_) ? @_ : keys %LEVELS ); - + $self->levels( scalar(@_) ? @_ : (qw/info warn error fatal/) ); return $self; }; @@ -108,9 +107,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 +116,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 {