extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 01:37:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add non-fatal error capability

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-08-23 05:50:36 -07:00
parent dffd98dff7
commit 112312f2ee
2 changed files with 76 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -811,6 +811,10 @@ sub compiler {
# Accounting. # Accounting.
# #
setup_accounting if $config{ACCOUNTING}; setup_accounting if $config{ACCOUNTING};
#
# Bail out now if errors
#
exit_if_errors;
if ( $scriptfilename ) { if ( $scriptfilename ) {
# #

83
Shorewall/Perl/Shorewall/Config.pm
View File

@ -35,17 +35,18 @@ use warnings;
use File::Basename; use File::Basename;
use File::Temp qw/ tempfile tempdir /; use File::Temp qw/ tempfile tempdir /;
use Cwd qw(abs_path getcwd); use Cwd qw(abs_path getcwd);
use autouse 'Carp' => qw(longmess confess); use autouse 'Carp' => qw(longmess confess cluck);
use Scalar::Util 'reftype'; use Scalar::Util 'reftype';
use FindBin; use FindBin;
our @ISA = qw(Exporter); our @ISA = qw(Exporter);
# #
# Imported variables should be treated as read-only by importers # Imported variables should be treated as read-only by
#
our @EXPORT = qw( our @EXPORT = qw(
warning_message warning_message
fatal_error fatal_error
nonfatal_error
exit_if_errors
assert assert
progress_message progress_message
@ -557,6 +558,8 @@ use constant { PLAIN_READ => 0, # No read_a_line options
NORMAL_READ => -1 # All options NORMAL_READ => -1 # All options
}; };
my $errors;
sub process_shorewallrc($); sub process_shorewallrc($);
# #
# Rather than initializing globals in an INIT block or during declaration, # Rather than initializing globals in an INIT block or during declaration,
@ -595,6 +598,7 @@ sub initialize( $;$ ) {
$ifstack = 0; $ifstack = 0;
@ifstack = (); @ifstack = ();
$embedded = 0; $embedded = 0;
$errors = 0;
# #
# Misc Globals # Misc Globals
# #
@ -1107,9 +1111,9 @@ sub fatal_error {
printf $log '%s %2d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0]; printf $log '%s %2d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0];
if ( $confess ) { if ( $confess ) {
print $log longmess( " ERROR: @_$currentlineinfo\n" ); print $log longmess( " FATAL ERROR: @_$currentlineinfo\n" );
} else { } else {
print $log " ERROR: @_$currentlineinfo\n"; print $log " FATAL ERROR: @_$currentlineinfo\n";
} }
close $log; close $log;
@ -1122,8 +1126,8 @@ sub fatal_error {
confess "@_$currentlineinfo" if $confess; confess "@_$currentlineinfo" if $confess;
die "@_$currentlineinfo\n"; die "@_$currentlineinfo\n";
} else { } else {
confess " ERROR: @_$currentlineinfo" if $confess; confess " FATAL ERROR: @_$currentlineinfo" if $confess;
die " ERROR: @_$currentlineinfo\n"; die " FATAL ERROR: @_$currentlineinfo\n";
} }
} }
@ -1135,9 +1139,9 @@ sub fatal_error1 {
printf $log '%s %2d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0]; printf $log '%s %2d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0];
if ( $debug ) { if ( $debug ) {
print $log longmess( " ERROR: @_\n" ); print $log longmess( " FATAL ERROR: @_\n" );
} else { } else {
print $log " ERROR: @_\n"; print $log " FATAL ERROR: @_\n";
} }
close $log; close $log;
@ -1145,8 +1149,65 @@ sub fatal_error1 {
} }
cleanup; cleanup;
confess " ERROR: @_" if $debug; confess " FATAL ERROR: @_" if $debug;
die " ERROR: @_\n"; die " FATAL ERROR: @_\n";
}
#
# Issue non-fatal error message and die
#
sub nonfatal_error {
fatal_error @_ unless $command eq 'check';
my $currentlineinfo = currentlineinfo;
$| = 1; #Reset output buffering (flush any partially filled buffers).
if ( $log ) {
our @localtime = localtime;
printf $log '%s %2d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0];
if ( $confess ) {
print $log longmess( " ERROR: @_$currentlineinfo\n" );
} else {
print $log " ERROR: @_$currentlineinfo\n";
}
}
if ( $confess ) {
cluck " ERROR: @_$currentlineinfo";
} else {
print STDERR " ERROR: @_$currentlineinfo\n";
}
$errors++;
$| = 0;
0;
}
#
# Check for errors
#
sub exit_if_errors() {
if ( $errors ) {
$| = 1; #Reset output buffering (flush any partially filled buffers).
if ( $log ) {
our @localtime = localtime;
printf $log '%s %2d %02d:%02d:%02d ', $abbr[$localtime[4]], @localtime[3,2,1,0];
print $log "Compilation aborted -- $errors errors detected\n";
close $log;
$log = undef;
}
cleanup;
die "Compilation aborted -- $errors errors detected\n";
}
} }
# #