X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FLogging%2FLogAnyInjector.pm;h=70c538447cebddb48e8b9f6b7aeb5a89b93e8593;hp=77d75b7151bb4517c2289a16d5a8246dce100842;hb=293fb1ee44fb32ff692278802149f42a5e391197;hpb=088218cf6dc6b8ff02d40d5a79c0f5d81c9e4b22 diff --git a/lib/Object/Remote/Logging/LogAnyInjector.pm b/lib/Object/Remote/Logging/LogAnyInjector.pm index 77d75b7..70c5384 100644 --- a/lib/Object/Remote/Logging/LogAnyInjector.pm +++ b/lib/Object/Remote/Logging/LogAnyInjector.pm @@ -28,16 +28,15 @@ sub AUTOLOAD { #skip DESTROY and friends return if $log_level =~ m/^[A-Z]+$/; - if ($log_level =~ s/f$//) { - my $format = shift(@content); - $generator = sub { sprintf($format, @content) }; + if ($log_contextual_level = $LEVEL_NAME_MAP{$log_level}) { + $generator = sub { @content }; + } elsif(($log_level =~ s/f$//) && ($log_contextual_level = $LEVEL_NAME_MAP{$log_level})) { + my $format = shift(@content); + $generator = sub { sprintf($format, @content) }; } else { - $generator = sub { @content }; + croak "invalid log level: $log_level"; } - - $log_contextual_level = $LEVEL_NAME_MAP{$log_level}; - croak "invalid log level name: $log_level" unless defined $log_contextual_level; - + router->handle_log_request({ controller => 'Log::Any', package => scalar(caller),