X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FLog.pm;h=a28c373924510a6a3633e1bd1a984d52f9dfa918;hb=71415389f4a9968c22da3255dcaaf2669fa58731;hp=7a69d039b3f66bbc94aebb90e38c9c178daddc77;hpb=2f3812528068bc1d9f7840067f0c03d36cd47e6d;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Log.pm b/lib/Catalyst/Log.pm index 7a69d03..a28c373 100644 --- a/lib/Catalyst/Log.pm +++ b/lib/Catalyst/Log.pm @@ -1,7 +1,10 @@ package Catalyst::Log; use Moose; +with 'MooseX::Emulate::Class::Accessor::Fast'; + use Data::Dump; +use Class::MOP (); our %LEVELS = (); @@ -12,7 +15,7 @@ has abort => (is => 'rw'); { my @levels = qw[ debug info warn error fatal ]; - my $meta = __PACKAGE__->meta; + my $meta = Class::MOP::get_metaclass_by_name(__PACKAGE__); for ( my $i = 0 ; $i < @levels ; $i++ ) { my $name = $levels[$i]; @@ -98,8 +101,23 @@ sub _send_to_log { 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;