Use ne instead of != for strings

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon / Format.pm

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index bab6d977778c257a853069c0171c2884a66a6a3b..866345f2a90f8721c5e680b9db8f97966ac39577 100644 (file)
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -36,20 +36,22 @@ 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 && $signame != 'PIPE';
+                       die [DIED, "Crash (SIG$signame)"] if $sig && $signame ne 'PIPE';
                        die [NZX, "Non-zero exit status: " . ($? >> 8)] if $? >> 8;
                } else {
                        my @fds = exists $args{fds} ? @{$args{fds}} : ();