r45421 - in /trunk/liblog-handler-perl: Build.PL ChangeLog META.yml Makefile.PL README debian/changelog examples/logger/myapp.pl lib/Log/Handler.pm lib/Log/Handler/Config.pm lib/Log/Handler/Output.pm lib/Log/Handler/Output/DBI.pm

nhandler-guest at users.alioth.debian.org nhandler-guest at users.alioth.debian.org
Tue Oct 6 21:56:34 UTC 2009


Author: nhandler-guest
Date: Tue Oct  6 21:56:28 2009
New Revision: 45421

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=45421
Log:
Update to 0.57-1

Modified:
    trunk/liblog-handler-perl/Build.PL
    trunk/liblog-handler-perl/ChangeLog
    trunk/liblog-handler-perl/META.yml
    trunk/liblog-handler-perl/Makefile.PL
    trunk/liblog-handler-perl/README
    trunk/liblog-handler-perl/debian/changelog
    trunk/liblog-handler-perl/examples/logger/myapp.pl
    trunk/liblog-handler-perl/lib/Log/Handler.pm
    trunk/liblog-handler-perl/lib/Log/Handler/Config.pm
    trunk/liblog-handler-perl/lib/Log/Handler/Output.pm
    trunk/liblog-handler-perl/lib/Log/Handler/Output/DBI.pm

Modified: trunk/liblog-handler-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblog-handler-perl/Build.PL?rev=45421&op=diff
==============================================================================
--- trunk/liblog-handler-perl/Build.PL (original)
+++ trunk/liblog-handler-perl/Build.PL Tue Oct  6 21:56:28 2009
@@ -21,7 +21,6 @@
     requires => {
         'Carp'               => 0,
         'Data::Dumper'       => 0,
-        'Devel::Backtrace'   => 0.05,
         'Fcntl'              => 0,
         'File::Spec'         => 0,
         'Params::Validate'   => 0,
@@ -29,7 +28,6 @@
         'Test::More'         => 0,
         'Time::HiRes'        => 0,
         'Sys::Hostname'      => 0,
-        'UNIVERSAL::require' => 0,
     },
 );
 

Modified: trunk/liblog-handler-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblog-handler-perl/ChangeLog?rev=45421&op=diff
==============================================================================
--- trunk/liblog-handler-perl/ChangeLog (original)
+++ trunk/liblog-handler-perl/ChangeLog Tue Oct  6 21:56:28 2009
@@ -1,3 +1,7 @@
+0.57    Released at 2009-10-06.
+        - Kicked UNIVERSAL::require.
+        - Kicked Devel::Backtrace.
+
 0.56    Released at 2009-06-06.
         - Just a full version.
 

Modified: trunk/liblog-handler-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblog-handler-perl/META.yml?rev=45421&op=diff
==============================================================================
--- trunk/liblog-handler-perl/META.yml (original)
+++ trunk/liblog-handler-perl/META.yml Tue Oct  6 21:56:28 2009
@@ -1,6 +1,6 @@
 ---
 name: Log-Handler
-version: 0.56
+version: 0.57
 author:
   - Jonny Schulz
 abstract: Log messages to several outputs.
@@ -10,7 +10,6 @@
 requires:
   Carp: 0
   Data::Dumper: 0
-  Devel::Backtrace: 0.05
   Fcntl: 0
   File::Spec: 0
   POSIX: 0
@@ -18,7 +17,6 @@
   Sys::Hostname: 0
   Test::More: 0
   Time::HiRes: 0
-  UNIVERSAL::require: 0
 recommends:
   Config::General: 0
   Config::Properties: 0
@@ -30,16 +28,16 @@
 provides:
   Log::Handler:
     file: lib/Log/Handler.pm
-    version: 0.56
+    version: 0.57
   Log::Handler::Config:
     file: lib/Log/Handler/Config.pm
-    version: 0.04
+    version: 0.05
   Log::Handler::Levels:
     file: lib/Log/Handler/Levels.pm
     version: 0.05
   Log::Handler::Output:
     file: lib/Log/Handler/Output.pm
-    version: 0.06
+    version: 0.07
   Log::Handler::Output::DBI:
     file: lib/Log/Handler/Output/DBI.pm
     version: 0.06

Modified: trunk/liblog-handler-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblog-handler-perl/Makefile.PL?rev=45421&op=diff
==============================================================================
--- trunk/liblog-handler-perl/Makefile.PL (original)
+++ trunk/liblog-handler-perl/Makefile.PL Tue Oct  6 21:56:28 2009
@@ -7,15 +7,13 @@
           'PREREQ_PM' => {
                            'Carp' => 0,
                            'Data::Dumper' => 0,
-                           'Devel::Backtrace' => '0.05',
                            'Fcntl' => 0,
                            'File::Spec' => 0,
                            'POSIX' => 0,
                            'Params::Validate' => 0,
                            'Sys::Hostname' => 0,
                            'Test::More' => 0,
-                           'Time::HiRes' => 0,
-                           'UNIVERSAL::require' => 0
+                           'Time::HiRes' => 0
                          },
           'INSTALLDIRS' => 'site',
           'EXE_FILES' => []

Modified: trunk/liblog-handler-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblog-handler-perl/README?rev=45421&op=diff
==============================================================================
--- trunk/liblog-handler-perl/README (original)
+++ trunk/liblog-handler-perl/README Tue Oct  6 21:56:28 2009
@@ -874,7 +874,7 @@
         $log->info('message');
 
     For a little example you can take a look into the examples directory of
-    the distribution (Log-Handler-$VERSION/examples/logger.pl).
+    the distribution (examples/logger/).
 
 EXAMPLES
     Log::Handler::Examples
@@ -906,7 +906,6 @@
         POSIX
         Time::HiRes
         Sys::Hostname
-        UNIVERSAL::require
 
     Recommended modules:
 

Modified: trunk/liblog-handler-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblog-handler-perl/debian/changelog?rev=45421&op=diff
==============================================================================
--- trunk/liblog-handler-perl/debian/changelog (original)
+++ trunk/liblog-handler-perl/debian/changelog Tue Oct  6 21:56:28 2009
@@ -1,3 +1,9 @@
+liblog-handler-perl (0.57-1) UNRELEASED; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+
+ -- Live session user <ubuntu at ubuntu>  Tue, 06 Oct 2009 21:54:39 +0000
+
 liblog-handler-perl (0.56-2) UNRELEASED; urgency=low
 
   * Update ryan52's email address

Modified: trunk/liblog-handler-perl/examples/logger/myapp.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblog-handler-perl/examples/logger/myapp.pl?rev=45421&op=diff
==============================================================================
--- trunk/liblog-handler-perl/examples/logger/myapp.pl (original)
+++ trunk/liblog-handler-perl/examples/logger/myapp.pl Tue Oct  6 21:56:28 2009
@@ -17,7 +17,7 @@
 
 =head1 COPYRIGHT
 
-Copyright (C) 2007-2008 by Jonny Schulz. All rights reserved.
+Copyright (C) 2007-2009 by Jonny Schulz. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
@@ -26,7 +26,7 @@
 
 use strict;
 use warnings;
-use Log::Handler 'myapp' => 'LOG';
+use Log::Handler myapp => 'LOG';
 use lib '.';
 use MyApp;
 

Modified: trunk/liblog-handler-perl/lib/Log/Handler.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblog-handler-perl/lib/Log/Handler.pm?rev=45421&op=diff
==============================================================================
--- trunk/liblog-handler-perl/lib/Log/Handler.pm (original)
+++ trunk/liblog-handler-perl/lib/Log/Handler.pm Tue Oct  6 21:56:28 2009
@@ -915,7 +915,7 @@
     $log->info('message');
 
 For a little example you can take a look into the examples directory
-of the distribution (Log-Handler-$VERSION/examples/logger.pl).
+of the distribution (examples/logger/).
 
 =head1 EXAMPLES
 
@@ -950,7 +950,6 @@
     POSIX
     Time::HiRes
     Sys::Hostname
-    UNIVERSAL::require
 
 Recommended modules:
 
@@ -1026,13 +1025,12 @@
 use warnings;
 use Carp;
 use Params::Validate;
-use UNIVERSAL::require;
 use Log::Handler::Output;
 use Log::Handler::Config;
 use Log::Handler::Pattern;
 use base qw(Log::Handler::Levels);
 
-our $VERSION = '0.56';
+our $VERSION = '0.57';
 our $ERRSTR  = '';
 
 # $TRACE and $CALLER_LEVEL are both used as global
@@ -1446,7 +1444,9 @@
             $package = 'Log::Handler::Output::' . ucfirst($type);
         }
 
-        $package->require;
+        eval "require $package";
+        die $@ if $@;
+
         $output = $package->new($output_opts)
             or Carp::croak $package->errstr;
     }

Modified: trunk/liblog-handler-perl/lib/Log/Handler/Config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblog-handler-perl/lib/Log/Handler/Config.pm?rev=45421&op=diff
==============================================================================
--- trunk/liblog-handler-perl/lib/Log/Handler/Config.pm (original)
+++ trunk/liblog-handler-perl/lib/Log/Handler/Config.pm Tue Oct  6 21:56:28 2009
@@ -334,7 +334,6 @@
 
     Carp
     Params::Validate
-    UNIVERSAL::require
 
 =head1 EXPORTS
 
@@ -363,12 +362,11 @@
 
 use strict;
 use warnings;
-our $VERSION = '0.04';
+our $VERSION = '0.05';
 
 use Carp;
 use File::Spec;
 use Params::Validate;
-use UNIVERSAL::require;
 
 sub config {
     my $self   = shift;
@@ -411,7 +409,10 @@
     if (ref($params->{config})) {
         $config = $params->{config};
     } elsif ($params->{config}) {
-        $plugin->require or croak "Unable to load plugin '$plugin'";
+        eval "require $plugin";
+        if ($@) {
+            croak "unable to load plugin '$plugin' - $@";
+        }
         $config = $plugin->get_config($params->{config});
     }
 

Modified: trunk/liblog-handler-perl/lib/Log/Handler/Output.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblog-handler-perl/lib/Log/Handler/Output.pm?rev=45421&op=diff
==============================================================================
--- trunk/liblog-handler-perl/lib/Log/Handler/Output.pm (original)
+++ trunk/liblog-handler-perl/lib/Log/Handler/Output.pm Tue Oct  6 21:56:28 2009
@@ -20,7 +20,6 @@
 
     Carp
     UNIVERSAL
-    Devel::Backtrace
 
 =head1 AUTHOR
 
@@ -41,9 +40,8 @@
 use warnings;
 use Carp;
 use UNIVERSAL;
-use Devel::Backtrace;
 
-our $VERSION = '0.06';
+our $VERSION = '0.07';
 our $ERRSTR  = '';
 
 sub new {
@@ -142,22 +140,28 @@
 
 sub _add_trace {
     my ($self, $message) = @_;
+    my @caller = ();
+    my $skip   = $self->{debug_skip};
 
     if ( $message->{message} =~ /.\z/ ) {
         $message->{message} .= "\n";
     }
 
-    my $bt = Devel::Backtrace->new($self->{debug_skip});
+    for (my $i=0; my @c = caller($i); $i++) {
+        my %frame;
+        @frame{qw/package filename line subroutine hasargs wantarray evaltext is_require/} = @c[0..7];
+        push @caller, \%frame;
+    }
 
-    foreach my $point (reverse 0..$bt->points-1) {
-        $message->{message} .= ' ' x 3 . "CALL($point):";
-        my $caller = $bt->point($point);
+    foreach my $i (reverse $skip..$#caller) {
+        $message->{message} .= ' ' x 3 . "CALL($i):";
+        my $frame = $caller[$i];
         foreach my $key (qw/package filename line subroutine hasargs wantarray evaltext is_require/) {
-            next unless defined $caller->{$key};
+            next unless defined $frame->{$key};
             if ($self->{debug_mode} == 1) { # line mode
-                $message->{message} .= " $key($caller->{$key})";
+                $message->{message} .= " $key($frame->{$key})";
             } elsif ($self->{debug_mode} == 2) { # block mode
-                $message->{message} .= "\n" . ' ' x 6 . sprintf('%-12s', $key) . $caller->{$key};
+                $message->{message} .= "\n" . ' ' x 6 . sprintf('%-12s', $key) . $frame->{$key};
             }
         }
         $message->{message} .= "\n";

Modified: trunk/liblog-handler-perl/lib/Log/Handler/Output/DBI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblog-handler-perl/lib/Log/Handler/Output/DBI.pm?rev=45421&op=diff
==============================================================================
--- trunk/liblog-handler-perl/lib/Log/Handler/Output/DBI.pm (original)
+++ trunk/liblog-handler-perl/lib/Log/Handler/Output/DBI.pm Tue Oct  6 21:56:28 2009
@@ -88,6 +88,14 @@
 
 Pass the database driver.
 
+=item B<host>
+
+Pass the hostname where the database is running.
+
+=item B<port>
+
+Pass the port where the database is listened.
+
 =item B<user>
 
 Pass the database user for the connect.
@@ -95,14 +103,6 @@
 =item B<password>
 
 Pass the users password.
-
-=item B<host>
-
-Pass the hostname where the database is running.
-
-=item B<port>
-
-Pass the port where the database is listened.
 
 =item B<table> and B<columns>
 




More information about the Pkg-perl-cvs-commits mailing list