X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FLog.pm;h=e1cbca97c0911f9fe9446cd24b6c786b752548da;hb=846772b73d4b1d0791afaf29d1b271eaccb42de1;hp=833087bebb67170ce3f67c53635aa88fc7e91d82;hpb=b333ca6bc3db5fed3310074236b8ff2b1ad2a81b;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm
index 833087b..e1cbca9 100644
--- a/lib/Catalyst/Log.pm
+++ b/lib/Catalyst/Log.pm
@@ -4,7 +4,59 @@ use strict;
 use base 'Class::Accessor::Fast';
 use Data::Dumper;
 
-$Data::Dumper::Terse = 1;
+our @levels = qw[ debug info warn error fatal ];
+
+{
+    no strict 'refs';
+
+    for ( my $i = 0 ; $i < @levels ; $i++ ) {
+
+        my $name  = $levels[$i];
+        my $level = 1 << $i;
+
+        *{$name} = sub {
+            my $self = shift;
+
+            if ( $self->{level} & $level ) {
+                $self->_log( $name, @_ );
+            }
+        };
+
+        *{"is_$name"} = sub {
+            my $self = shift;
+
+            if (@_) {
+                if ( $_[0] ) {
+                    $self->{level} |= $level;
+                }
+                else {
+                    $self->{level} &= ~$level;
+                }
+            }
+            return $self->{level} & $level;
+        };
+    }
+
+    *new = sub { bless( { level => ( 1 << @levels ) - 1 }, shift ) }
+}
+
+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,17 +65,30 @@ 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);
+    
+    $log->is_debug;   # true if dubug messages is enabled
+    $log->is_info;    # true if info messages is enabled
+    $log->is_warn;    # true if warn messages is enabled 
+    $log->is_error;   # true if error messages is enabled
+    $log->is_fatal;   # true if fatal messages is enabled
+
+    if ( $log->is_info ) {
+         # 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 );
 
@@ -34,60 +99,22 @@ Your logging object is expected to provide the interface described here.
 
 =over 4
 
-=item $log->debug(@message)
+=item $log->debug($message)
 
 Logs a debugging message.
 
-=cut
-
-sub debug { shift->_format( 'debug', @_ ) }
-
-=item $log->error(@message)
+=item $log->error($message)
 
 Logs an error message.
 
-=cut
-
-sub error { shift->_format( 'error', @_ ) }
-
-=item $log->info(@message)
+=item $log->info($message)
 
 Logs an informational message.
 
-=cut
-
-sub info { shift->_format( 'info', @_ ) }
-
-=item $log->warn(@message)
+=item $log->warn($message)
 
 Logs a warning message.
 
-=cut
-
-sub warn { shift->_format( 'warn', @_ ) }
-
-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 );
-}
-
-=back
-
-=head1 DEPRECATED METHODS
-
-=over 4
-
-=item $log->dump($reference)
-
-Logs a Data::Dumper of reference.
-
-=cut
-
-sub dump { shift->_format( 'dump', Dumper( $_[0] ) ) }
-
 =back
 
 =head1 SEE ALSO
@@ -97,11 +124,12 @@ L<Catalyst>.
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Marcus Ramberg, C<mramberg@cpan.org>
 
 =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