X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FLog.pm;h=97923930ed992c650da0cdd9e8517f87ca546d43;hb=49ba64d78a4954b8e478745f317ad6b593a6b0ae;hp=6bb131a98eee3ff026eac3bd0cbd0775b1b7b621;hpb=c9afa5fc4ed6c36afe6653d7d8fbb9909994c1a8;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm
index 6bb131a..9792393 100644
--- a/lib/Catalyst/Log.pm
+++ b/lib/Catalyst/Log.pm
@@ -4,7 +4,77 @@ use strict;
 use base 'Class::Accessor::Fast';
 use Data::Dumper;
 
-$Data::Dumper::Terse = 1;
+our %LEVELS = ();
+
+__PACKAGE__->mk_accessors('level');
+
+{
+    my @levels = qw[ debug info warn error fatal ];
+
+    for ( my $i = 0 ; $i < @levels ; $i++ ) {
+
+        my $name  = $levels[$i];
+        my $level = 1 << $i;
+
+        $LEVELS{$name} = $level;
+
+        no strict 'refs';
+
+        *{$name} = sub {
+            my $self = shift;
+
+            if ( $self->{level} & $level ) {
+                $self->_log( $name, @_ );
+            }
+        };
+
+        *{"is_$name"} = sub {
+            my $self = shift;
+            return $self->{level} & $level;
+        };
+    }
+}
+
+sub new {
+    my $class = shift;
+    my $self  = $class->SUPER::new;
+    $self->levels( scalar(@_) ? @_ : keys %LEVELS );
+    return $self;
+}
+
+sub levels {
+    my ( $self, @levels ) = @_;
+    $self->level(0);
+    $self->enable(@levels);
+}
+
+sub enable {
+    my ( $self, @levels ) = @_;
+    $self->{level} |= $_ for map { $LEVELS{$_} } @levels;
+}
+
+sub disable {
+    my ( $self, @levels ) = @_;
+    $self->{level} &= ~$_ for map { $LEVELS{$_} } @levels;
+}
+
+sub _dump {
+    my $self = shift;
+    local $Data::Dumper::Terse = 1;
+    $self->info( Dumper( $_[0] ) );
+}
+
+sub _log {
+    my $self    = shift;
+    my $level   = shift;
+    my $time    = localtime(time);
+    my $message = join( "\n", @_ );
+    printf( STDERR "[%s] [catalyst] [%s] %s\n", $time, $level, $message );
+}
+
+1;
+
+__END__
 
 =head1 NAME
 
@@ -13,80 +83,98 @@ Catalyst::Log - Catalyst Log Class
 =head1 SYNOPSIS
 
     $log = $c->log;
-    $log->debug(@message);
-    $log->error(@message);
-    $log->info(@message);
-    $log->warn(@message);
+    $log->debug($message);
+    $log->info($message);
+    $log->warn($message);
+    $log->error($message);
+    $log->fatal($message);
+
+    if ( $log->is_debug ) {
+         # expensive debugging
+    }
+
 
 See L<Catalyst>.
 
 =head1 DESCRIPTION
 
-This module provides the default, simple logging functionality for Catalyst.
-If you want something different set C<$c->log> in your application module, e.g.:
+This module provides the default, simple logging functionality for
+Catalyst.
+If you want something different set C<$c->log> in your application
+module, e.g.:
 
     $c->log( MyLogger->new );
 
 Your logging object is expected to provide the interface described here.
 
-
-=head1 METHODS
+=head1 LOG LEVELS
 
 =over 4
 
-=item $log->debug(@message)
+=item debug
 
-Logs a debugging message.
+    $log->is_debug;
+    $log->debug($message);
 
-=cut
+=item info
 
-sub debug { shift->_format( 'debug', @_ ) }
+    $log->is_info;
+    $log->info($message);
 
-=item $log->error(@message)
+=item warn
 
-Logs an error message.
+    $log->is_warn;
+    $log->warn($message);
 
-=cut
+=item error
 
-sub error { shift->_format( 'error', @_ ) }
+    $log->is_error;
+    $log->error($message);
 
-=item $log->info(@message)
+=item fatal
 
-Logs an informational message.
+    $log->is_fatal;
+    $log->fatal($message);
 
-=cut
+=back
 
-sub info { shift->_format( 'info', @_ ) }
+=head1 METHODS
 
-=item $log->warn(@message)
+=over 4
 
-Logs a warning message.
+=item new
 
-=cut
+Constructor, defaults to enable all levels unless levels a provieded in
+arguments.
 
-sub warn { shift->_format( 'warn', @_ ) }
+    $log = Catalyst::Log->new;
+    $log = Catalyst::Log->new( 'warn', 'error', 'fatal' );
 
-sub _format {
-    my $class   = shift;
-    my $level   = shift;
-    my $time    = localtime(time);
-    my $message = join( "\n", @_ );
-    printf( STDERR "[%s] [catalyst] [%s] %s\n", $time, $level, $message );
-}
+=item levels
 
-=back
+Set log levels
 
-=head1 DEPRECATED METHODS
+    $log->levels( 'warn', 'error', 'fatal' );
 
-=over 4
+=item enable
 
-=item $log->dump($reference)
+Enable log levels
 
-Logs a Data::Dumper of reference.
+    $log->enable( 'warn', 'error' );
 
-=cut
+=item disable
+
+Disable log levels
+
+    $log->disable( 'warn', 'error' );
+
+=item is_debug
+=item is_error
+=item is_fatal
+=item is_info
+=item is_warn
 
-sub dump { shift->_format( 'dump', Dumper( $_[1] ) ) }
+Is the log level active?
 
 =back
 
@@ -97,11 +185,13 @@ L<Catalyst>.
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Marcus Ramberg, C<mramberg@cpan.org>
+Christian Hansen, C<ch@ngmedia.com>
 
 =head1 COPYRIGHT
 
-This program is free software, you can redistribute it and/or modify it under
-the same terms as Perl itself.
+This program is free software, you can redistribute it and/or modify
+it under the same terms as Perl itself.
 
 =cut