X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FLog.pm;h=a131821719f2952209d239f9ea53dde114bcd1a3;hb=d14f912340c595a28dd86e273ad386390e570b32;hp=a45fb59643c5767a6f69bdcacfce85664aa39c35;hpb=6f1f968a6bc42bf4a4b50a1ee22d3aaecd801876;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm index a45fb59..a131821 100644 --- a/lib/Catalyst/Log.pm +++ b/lib/Catalyst/Log.pm @@ -1,9 +1,10 @@ package Catalyst::Log; -use MRO::Compat; -use mro 'c3'; use Moose; +with 'MooseX::Emulate::Class::Accessor::Fast'; + use Data::Dump; +use Class::MOP (); our %LEVELS = (); @@ -14,6 +15,7 @@ has abort => (is => 'rw'); { my @levels = qw[ debug info warn error fatal ]; + my $meta = Class::MOP::get_metaclass_by_name(__PACKAGE__); for ( my $i = 0 ; $i < @levels ; $i++ ) { my $name = $levels[$i]; @@ -21,29 +23,28 @@ has abort => (is => 'rw'); $LEVELS{$name} = $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 ) = @_; @@ -101,7 +102,7 @@ sub _send_to_log { } no Moose; -__PACKAGE__->meta->make_immutable(); +__PACKAGE__->meta->make_immutable(inline_constructor => 0); 1; @@ -241,11 +242,9 @@ over the log output. L. -=head1 AUTHOR +=head1 AUTHORS -Sebastian Riedel, C -Marcus Ramberg, C -Christian Hansen, C +Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT