X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FFormat.pm;h=5132fbd7387584d0f4ab8888a526e878c5f06ca3;hp=b80dd7dd673740f2eb712e372a5fa4a5c75b817f;hb=d16a999c8e8166691919b98ccbe4bd9332a3543d;hpb=cdd811c0738f8b83032002a04dc5c070cdb1f1ce diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm index b80dd7d..5132fbd 100644 --- a/lib/Gruntmaster/Daemon/Format.pm +++ b/lib/Gruntmaster/Daemon/Format.pm @@ -15,7 +15,7 @@ use List::MoreUtils qw/natatime/; use Log::Log4perl qw/get_logger/; use IPC::Signal qw/sig_name sig_num/; -our $VERSION = "5999.000_001"; +our $VERSION = "5999.000_002"; our @EXPORT_OK = qw/prepare_files/; ################################################## @@ -36,7 +36,9 @@ sub command_and_args{ sub mkrun{ my $format = shift; sub{ + local *__ANON__ = 'mkrun_runner'; my ($name, %args) = @_; + get_logger->trace("Running $name..."); my $basename = fileparse $name, qr/\.[^.]*/; my $ret = fork // die 'Cannot fork'; if ($ret) { @@ -49,8 +51,8 @@ sub mkrun{ my $signame = sig_name $sig; die [TLE, "Time Limit Exceeded"] if $tle; die [OLE, 'Output Limit Exceeded'] if $sig && $signame eq 'XFSZ'; - die [DIED, "Crash (SIG$signame)"] if $sig; - die [NZX, "Non-zero exit status: " . ($? >> 8)] if $?; + die [DIED, "Crash (SIG$signame)"] if $sig && $signame != 'PIPE'; + die [NZX, "Non-zero exit status: " . ($? >> 8)] if $? >> 8; } else { my @fds = exists $args{fds} ? @{$args{fds}} : (); $^F = 50;