Changed default match to use path instead of result

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Log.pm

diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm
index 67fc1e6..56f4ff4 100644 (file)
--- a/lib/Catalyst/Log.pm
+++ b/lib/Catalyst/Log.pm
@@ -7,6 +7,8 @@ use Data::Dumper;
 our %LEVELS = ();
 
 __PACKAGE__->mk_accessors('level');
+__PACKAGE__->mk_accessors('body');
+__PACKAGE__->mk_accessors('abort');
 
 {
     my @levels = qw[ debug info warn error fatal ];
@@ -69,7 +71,18 @@ sub _log {
     my $level   = shift;
     my $time    = localtime(time);
     my $message = join( "\n", @_ );
-    printf( STDERR "[%s] [catalyst] [%s] %s\n", $time, $level, $message );
+    $self->{body} .= sprintf( "[%s] [catalyst] [%s] %s\n", 
+                    $time, $level, $message ) ;
+}
+
+sub _flush {
+    my $self    = shift;
+    if ( $self->abort || ! $self->body ) {
+       $self->abort(undef);
+    } else {
+       print( STDERR $self->body);
+    }
+    $self->body(undef);
 }
 
 1;
@@ -144,11 +157,11 @@ Your logging object is expected to provide the interface described here.
 
 =item new
 
-Constructor, defaults to enable all levels unless levels a provieded in
+Constructor. Defaults to enable all levels unless levels are provided in
 arguments.
 
     $log = Catalyst::Log->new;
-    $log = Catalyst::Log->new( 'warn', 'error', 'fatal' );
+    $log = Catalyst::Log->new( 'warn', 'error' );
 
 =item levels
 
@@ -168,8 +181,32 @@ Disable log levels
 
     $log->disable( 'warn', 'error' );
 
+=item is_debug
+
+=item is_error
+
+=item is_fatal
+
+=item is_info
+
+=item is_warn
+
+Is the log level active?
+
+=item abort
+
+Should Catalyst emit logs for this request? Will be reset at the end of 
+each request. 
+
+*NOTE* This method is not compatible with other log apis, so if you plan
+to use Log4Perl or another logger, you should call it like this:
+
+    $c->log->abort(1) if $c->log->can('abort');
+
 =back
 
+
+
 =head1 SEE ALSO
 
 L<Catalyst>.