X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FLog.pm;h=4fd3ef0eda901d7b26337f015548a98598d50fbc;hb=bb7d3f91467380125e331f571f5151f77e0ef498;hp=ee9a7e50f06bd5dd8e64819e9e8e07147bcce892;hpb=66ef16798266544a462bc6f0250cc693caec47ed;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm
old mode 100755
new mode 100644
index ee9a7e5..4fd3ef0
--- a/lib/Catalyst/Log.pm
+++ b/lib/Catalyst/Log.pm
@@ -61,14 +61,26 @@ sub psgienv {
     }
 }
 
-around new => sub {
-    my $orig = shift;
+sub BUILDARGS {
     my $class = shift;
-    my $self = $class->$orig;
+    my $args;
 
-    $self->levels( scalar(@_) ? @_ : keys %LEVELS );
+    if (@_ == 1 && ref $_[0] eq 'HASH') {
+        $args = $_[0];
+    }
+    else {
+        $args = {
+            levels => [@_ ? @_ : keys %LEVELS],
+        };
+    }
 
-    return $self;
+    if (delete $args->{levels}) {
+        my $level = 0;
+        $level |= $_
+            for map $LEVEL_MATCH{$_}, @_ ? @_ : keys %LEVELS;
+        $args->{level} = $level;
+    }
+    return $args;
 };
 
 sub levels {
@@ -108,9 +120,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 +129,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 +153,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 @_;
     }
 }
@@ -162,7 +174,7 @@ $meta->add_before_method_modifier('body', sub {
 # End 5.70 backwards compatibility hacks.
 
 no Moose;
-__PACKAGE__->meta->make_immutable(inline_constructor => 0);
+__PACKAGE__->meta->make_immutable;
 
 1;
 
@@ -292,19 +304,19 @@ to use Log4Perl or another logger, you should call it like this:
 
 =head2 autoflush
 
-When enabled (default), messages are written to the log immediately instead 
-of queued until the end of the request. 
+When enabled (default), messages are written to the log immediately instead
+of queued until the end of the request.
 
-This option, as well as C<abort>, is provided for modules such as 
-L<Catalyst::Plugin::Static::Simple> to be able to programmatically 
+This option, as well as C<abort>, is provided for modules such as
+L<Catalyst::Plugin::Static::Simple> to be able to programmatically
 suppress the output of log messages. By turning off C<autoflush> (application-wide
-setting) and then setting the C<abort> flag within a given request, all log 
+setting) and then setting the C<abort> flag within a given request, all log
 messages for the given request will be suppressed. C<abort> can still be set
-independently of turning off C<autoflush>, however. It just means any messages 
-sent to the log up until that point in the request will obviously still be emitted, 
+independently of turning off C<autoflush>, however. It just means any messages
+sent to the log up until that point in the request will obviously still be emitted,
 since C<autoflush> means they are written in real-time.
 
-If you need to turn off autoflush you should do it like this (in your main app 
+If you need to turn off autoflush you should do it like this (in your main app
 class):
 
     after setup_finalize => sub {