pf-tools commit: r901 [parmelan-guest] - /branches/next-gen/lib/PFTools/Logger.pm
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Wed Sep 8 13:16:21 UTC 2010
Author: parmelan-guest
Date: Wed Sep 8 13:16:15 2010
New Revision: 901
URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=901
Log:
Logger.pm: style
Modified:
branches/next-gen/lib/PFTools/Logger.pm
Modified: branches/next-gen/lib/PFTools/Logger.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/next-gen/lib/PFTools/Logger.pm?rev=901&op=diff
==============================================================================
--- branches/next-gen/lib/PFTools/Logger.pm (original)
+++ branches/next-gen/lib/PFTools/Logger.pm Wed Sep 8 13:16:15 2010
@@ -22,6 +22,7 @@
use strict;
use warnings;
+use File::Basename;
use English qw( -no_match_vars ); # Avoids regex performance penalty
use Exporter;
@@ -50,26 +51,27 @@
my $DEFERREDLOG = 0;
# Error code and error messages
-our $CODE = {};
-$CODE->{'OK'} = 0;
-$CODE->{'WARNING'} = 1;
-$CODE->{'OPEN'} = 2;
-$CODE->{'SYNTAX'} = 3;
-$CODE->{'RIGHTS'} = 4;
-$CODE->{'UNLINK'} = 5;
-$CODE->{'EXEC'} = 6;
-$CODE->{'BIND_QUERY'} = 7;
-
-$CODE->{'INVALID_CONTEXT'} = 10;
-$CODE->{'INVALID_SECTNAME'} = 11;
-$CODE->{'INVALID_VALUE'} = 12;
-
-$CODE->{'UNDEF_KEY'} = 20;
-$CODE->{'DUPLICATE_VALUE'} = 21;
+our $CODE = {
+ 'OK' => 0,
+ 'WARNING' => 1,
+ 'OPEN' => 2,
+ 'SYNTAX' => 3,
+ 'RIGHTS' => 4,
+ 'UNLINK' => 5,
+ 'EXEC' => 6,
+ 'BIND_QUERY' => 7,
+
+ 'INVALID_CONTEXT' => 10,
+ 'INVALID_SECTNAME' => 11,
+ 'INVALID_VALUE' => 12,
+
+ 'UNDEF_KEY' => 20,
+ 'DUPLICATE_VALUE' => 21,
+};
# Vars needed by pf-launch
my $sortie;
-my $tmpfile = "/tmp/update-config.log";
+my $tmpfile = "/tmp/update-config.log"; # FIXME File::Temp
my $deferbuffer;
my $deferredlogbuffer = '';
@@ -82,11 +84,11 @@
= ( $rotatecursorcount + 1 ) % ( $#rotatecursortemplate + 1 );
}
-sub Set_deferredlog () {
+sub Set_deferredlog {
$DEFERREDLOG = 1;
}
-sub Unset_deferredlog () {
+sub Unset_deferredlog {
$DEFERREDLOG = 0;
}
@@ -144,75 +146,82 @@
}
-# Returns undef on error
-sub deferredlogpipe ($;$) {
+sub deferredlogpipe {
my ( $pipe_cmd, $deferredlog ) = @_;
+
+ return unless $pipe_cmd;
+
+ DeferOutput()
+ if $deferredlog or $DEFERREDLOG;
+
+ unless ( open DEFERREDLOGPIPE, '-|', $pipe_cmd ) {
+ Warn( $CODE->{'OPEN'}, "Unable to open pipe $pipe_cmd: $OS_ERROR" );
+ return;
+ }
+
my $ret = '';
-
- DeferOutput() if ( $deferredlog || $DEFERREDLOG );
-
- unless ( open DEFERREDLOGPIPE, '-|', $pipe_cmd ) {
- Warn( $CODE->{'OPEN'}, "Unable to open pipe $pipe_cmd : $OS_ERROR" );
- return;
- }
-
while (<DEFERREDLOGPIPE>) {
chomp;
$ret .= $_;
}
close DEFERREDLOGPIPE;
- UndeferOutput() if ( $deferredlog || $DEFERREDLOG );
+ UndeferOutput()
+ if $deferredlog or $DEFERREDLOG;
if ($deferbuffer) {
$deferredlogbuffer .= $deferbuffer;
$deferbuffer = undef;
}
- RotateCursor() if $deferredlog;
+ RotateCursor()
+ if $deferredlog;
return $ret;
}
-sub deferredlogsystem ($;$) {
+sub deferredlogsystem {
my ( $system_cmd, $deferredlog ) = @_;
- my $ret;
-
- DeferOutput() if ( $deferredlog || $DEFERREDLOG );
-
- $ret = system($system_cmd );
-
- UndeferOutput() if ( $deferredlog || $DEFERREDLOG );
-
- if ( defined $deferbuffer && $deferbuffer ne '' ) {
+
+ return unless $system_cmd;
+
+ DeferOutput()
+ if $deferredlog or $DEFERREDLOG;
+
+ my $ret = system($system_cmd );
+
+ UndeferOutput()
+ if $deferredlog or $DEFERREDLOG;
+
+ if ($deferbuffer) {
$deferredlogbuffer .= $deferbuffer;
$deferbuffer = undef;
}
- RotateCursor() if ($deferredlog);
+ RotateCursor()
+ if $deferredlog;
return $ret;
}
-sub DelLog () {
+sub DelLog {
$deferredlogbuffer = '';
}
-sub FlushLog () {
+sub FlushLog {
print STDERR $deferredlogbuffer;
DelLog();
}
# Log
-sub Log (@) {
+sub Log {
my (@msg) = @_;
- my @words = split( /\s+/, join( "", @msg ) );
+ my @words = split( /\s+/, join( '', @msg ) );
my $col = 0;
- my $sup = "";
- my $word;
-
- foreach $word (@words) {
+ my $sup = '';
+
+ foreach my $word (@words) {
my $len = length($word);
if ( defined($word) && $len > 0 ) {
if ( $col != 0 ) {
@@ -243,35 +252,29 @@
}
}
-# Debug
-sub Debug ($) {
+sub Debug {
my (@msg) = @_;
- # FIXME Ã faire une bonne fois pour toutes !
- my $basename = ( split( '/', $0 ) )[-1];
- Log( $basename . ": DEBUG: ", @msg );
-}
-
-# Warn
-sub Warn ($@) {
+ my $basename = basename $0;
+ Log( "$basename: DEBUG: ", @msg );
+}
+
+sub Warn {
+ my ( $err, @msg ) = @_; # FIXME: $err unused!?
+
+ my $basename = basename $0;
+ Log( "$basename: WARN: ", @msg );
+}
+
+sub Abort {
my ( $err, @msg ) = @_;
- my $basename;
-
- $basename = ( split( '/', $0 ) )[-1];
-
- Log( $basename . ": WARN: ", @msg );
-}
-
-# Abort
-sub Abort ($@) {
- my ( $err, @msg ) = @_;
- my $basename;
-
- $basename = ( split( '/', $0 ) )[-1];
-
- Log( $basename . ": ERR: ", @msg );
+
+ my $basename = basename $0;
+ Log( "$basename: ERR: ", @msg );
FlushLog();
exit $err;
}
+
1;
+
More information about the pf-tools-commits
mailing list