X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FRunner%2FInteractive.pm;h=5a986754c8b6451471c91d0957f4bb1a6a787114;hp=66493cfdb5af0f7e76be1fb36d784c6ca5800d38;hb=c020b922b2b04878b04b8d7e84079087f1dc2abc;hpb=967faabc4dd9e926a4c5bc316844b7033d744c69

diff --git a/lib/Gruntmaster/Daemon/Runner/Interactive.pm b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
index 66493cf..5a98675 100644
--- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm
+++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
@@ -23,18 +23,26 @@ sub run{
 
 	my $ret = fork // get_logger->logdie("Fork failed: $!");
 	if ($ret) {
-		$meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => [qw/0 fifo1 1 >fifo2/], map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/);
-		waitpid $ret, 0;
+		try {
+			$meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => [qw/0 fifo1 1 >fifo2/], map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/);
+		} catch {
+			die $_
+		} finally {
+			waitpid $ret, 0;
+		};
 		die [WA, "Wrong Answer"] if $?;
 	} else {
 		try {
-			$meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [qw/1 >fifo1 0 fifo2 4 >result/], args => [$test]);
+			$meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [qw/1 >fifo1 0 fifo2 4 >result/], args => [$test], map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/);
 		} catch {
 			exit 1;
 		};
 		exit
 	}
 
+	unlink 'fifo1';
+	unlink 'fifo2';
+
 	scalar slurp 'result'
 }