X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FFormat.pm;h=2678906c70199a9acb29f87064ef66b85204d057;hp=c49ffc1ea1b1b7336efa8ad04b76691c40531def;hb=197cd6a325653b82e59eb0d842a42b944b345109;hpb=d6a1ae0d77398b2a7ed967e10e8420ac7d9980e5 diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm index c49ffc1..2678906 100644 --- a/lib/Gruntmaster/Daemon/Format.pm +++ b/lib/Gruntmaster/Daemon/Format.pm @@ -36,21 +36,23 @@ 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) { my $tle; local $SIG{ALRM} = sub { kill KILL => $ret; $tle = 1}; alarm $args{timeout} if exists $args{timeout}; - wait; + waitpid $ret, 0; alarm 0; my $sig = $? & 127; 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;