Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30773
Modified Files:
Tag: b0_22_2
popfile.pl
Log Message:
Improve startup logger messages
Index: popfile.pl
===================================================================
RCS file: /cvsroot/popfile/engine/popfile.pl,v
retrieving revision 1.225.4.2
retrieving revision 1.225.4.3
diff -C2 -d -r1.225.4.2 -r1.225.4.3
*** popfile.pl 23 Jan 2008 08:38:29 -0000 1.225.4.2
--- popfile.pl 23 Jan 2008 19:18:42 -0000 1.225.4.3
***************
*** 9,13 ****
# which category the message belongs in and much more...
#
! # Copyright (c) 2001-2006 John Graham-Cumming
#
# This file is part of POPFile
--- 9,13 ----
# which category the message belongs in and much more...
#
! # Copyright (c) 2001-2008 John Graham-Cumming
#
# This file is part of POPFile
***************
*** 38,42 ****
my $fatal = 0;
! my $log = '';
if ( open PACKING, "<$packing_list" ) {
--- 38,42 ----
my $fatal = 0;
! my @log;
if ( open PACKING, "<$packing_list" ) {
***************
*** 60,64 ****
print STDERR "ERROR: POPFile needs Perl module $module, please install it.\n";
} else {
! $log .= "WARNING: POPFile may require Perl module $module; it is needed for \"$why\".\n";
}
}
--- 60,64 ----
print STDERR "ERROR: POPFile needs Perl module $module, please install it.\n";
} else {
! push @log, ("Warning: POPFile may require Perl module $module; it is needed only for \"$why\".");
}
}
***************
*** 67,71 ****
close PACKING;
} else {
! $log .= "WARNING: Couldn't open POPFile packing list ($packing_list) so cannot check configuration\n";
}
--- 67,71 ----
close PACKING;
} else {
! push @log, ("Warning: Couldn't open POPFile packing list ($packing_list) so cannot check configuration (this probably doesn't matter)");
}
***************
*** 86,93 ****
$POPFile->CORE_loader_init();
- # Grab the current version number and add to the log
-
- $log = 'POPFile v' . $POPFile->{version_string__} . " starting\n$log";
-
# Redefine POPFile's signals
--- 86,89 ----
***************
*** 106,116 ****
$POPFile->CORE_start();
# If there were any log messages from the packing list check then
# log them now
! if ( $log ne '' ) {
! $POPFile->get_module( 'POPFile::Logger' )->debug( 0, $log );
}
# This is the main POPFile loop that services requests, it will
# exit only when we need to exit
--- 102,118 ----
$POPFile->CORE_start();
+ $POPFile->get_module( 'POPFile::Logger' )->debug( 0, 'POPFile ' . $POPFile->CORE_version() . ' starting' );
+
# If there were any log messages from the packing list check then
# log them now
! if ( $#log != -1 ) {
! foreach my $m (@log) {
! $POPFile->get_module( 'POPFile::Logger' )->debug( 0, $m );
! }
}
+ $POPFile->get_module( 'POPFile::Logger' )->debug( 0, "POPFile successfully started" );
+
# This is the main POPFile loop that services requests, it will
# exit only when we need to exit
|
