package Catalyst::Log;
-use Class::C3;
use Moose;
+with 'MooseX::Emulate::Class::Accessor::Fast';
+
use Data::Dump;
+use Class::MOP ();
+use Carp qw/ cluck /;
-our %LEVELS = ();
+our %LEVELS = (); # Levels stored as bit field, ergo debug = 1, warn = 2 etc
+our %LEVEL_MATCH = (); # Stored as additive, thus debug = 31, warn = 30 etc
has level => (is => 'rw');
has _body => (is => 'rw');
{
my @levels = qw[ debug info warn error fatal ];
- for ( my $i = 0 ; $i < @levels ; $i++ ) {
+ my $meta = Class::MOP::get_metaclass_by_name(__PACKAGE__);
+ my $summed_level = 0;
+ for ( my $i = $#levels ; $i >= 0 ; $i-- ) {
my $name = $levels[$i];
+
my $level = 1 << $i;
+ $summed_level |= $level;
$LEVELS{$name} = $level;
+ $LEVEL_MATCH{$name} = $summed_level;
- no strict 'refs';
-
- *{$name} = sub {
+ $meta->add_method($name, sub {
my $self = shift;
if ( $self->level & $level ) {
$self->_log( $name, @_ );
}
- };
+ });
- *{"is_$name"} = sub {
+ $meta->add_method("is_$name", sub {
my $self = shift;
return $self->level & $level;
- };
+ });;
}
}
-sub new {
+around new => sub {
+ my $orig = shift;
my $class = shift;
- my $self = $class->next::method;
+ my $self = $class->$orig;
+
$self->levels( scalar(@_) ? @_ : keys %LEVELS );
+
return $self;
-}
+};
sub levels {
my ( $self, @levels ) = @_;
sub enable {
my ( $self, @levels ) = @_;
my $level = $self->level;
- for(map { $LEVELS{$_} } @levels){
+ for(map { $LEVEL_MATCH{$_} } @levels){
$level |= $_;
}
$self->level($level);
$self->level($level);
}
+our $HAS_DUMPED;
sub _dump {
my $self = shift;
+ unless ($HAS_DUMPED++) {
+ cluck("Catalyst::Log::_dump is deprecated and will be removed. Please change to using your own Dumper.\n");
+ }
$self->info( Data::Dump::dump(@_) );
}
print STDERR @_;
}
+# 5.7 compat code.
+# Alias _body to body, add a before modifier to warn..
+my $meta = __PACKAGE__->meta; # Calling meta method here fine as we happen at compile time.
+$meta->add_method('body', $meta->get_method('_body'));
+my %package_hash; # Only warn once per method, per package.
+ # I haven't provided a way to disable them, patches welcome.
+$meta->add_before_method_modifier('body', sub {
+ my $class = blessed(shift);
+ $package_hash{$class}++ || do {
+ warn("Class $class is calling the deprecated method Catalyst::Log->body method,\n"
+ . "this will be removed in Catalyst 5.81");
+ };
+});
+# End 5.70 backwards compatibility hacks.
+
no Moose;
-__PACKAGE__->meta->make_immutable();
+__PACKAGE__->meta->make_immutable(inline_constructor => 0);
1;
=head2 abort
-Should Catalyst emit logs for this request? Will be reset at the end of
-each request.
+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:
L<Catalyst>.
-=head1 AUTHOR
+=head1 AUTHORS
-Sebastian Riedel, C<sri@cpan.org>
-Marcus Ramberg, C<mramberg@cpan.org>
-Christian Hansen, C<ch@ngmedia.com>
+Catalyst Contributors, see Catalyst.pm
=head1 COPYRIGHT
-This program is free software, you can redistribute it and/or modify
+This library is free software. You can redistribute it and/or modify
it under the same terms as Perl itself.
=cut