X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=gruntmaster-exec;h=b6577f4649206fee2e1cd108b6ec62cce581d8f1;hp=0a2c50c204c12477cd93d574353fe3a7bdeb80bd;hb=5738d1dcc0e4af406b1bc14c23af9c6e53ba259c;hpb=42ce8ba99a9d50c8bb440451f45098a98769216a

diff --git a/gruntmaster-exec b/gruntmaster-exec
index 0a2c50c..b6577f4 100755
--- a/gruntmaster-exec
+++ b/gruntmaster-exec
@@ -28,16 +28,15 @@ use POSIX qw//;
 use Text::ParseWords qw/shellwords/;
 use Time::HiRes qw/alarm/;
 
-my (@fds, $timeout, $mlimit, $olimit, $sudo);
-my $close = 1;
+my (@fds, $timeout, $mlimit, $olimit, $sudo, $keep_stderr);
 
 GetOptions(
-	"fd=s"      => \@fds,
-	"timeout=f" => \$timeout,
-	"mlimit=i"  => \$mlimit,
-	"olimit=i"  => \$olimit,
-	"close!"    => \$close,
-	"sudo!"   => \$sudo,
+	"fd=s"         => \@fds,
+	"timeout=f"    => \$timeout,
+	"mlimit=i"     => \$mlimit,
+	"olimit=i"     => \$olimit,
+	"keep-stderr!" => \$keep_stderr,
+	"sudo!"        => \$sudo,
 );
 
 my $killuser = $ENV{GRUNTMASTER_KILL_USER};
@@ -67,14 +66,13 @@ if ($ret) {
 	my $signame = sig_name $sig;
 	exit !say TLE,  "\nTime Limit Exceeded"   if $tle;
 	exit !say OLE,  "\nOutput Limit Exceeded" if $sig && $signame eq 'XFSZ';
-	exit !say DIED, "\nCrash (SIG$signame)"   if $sig && $signame ne 'PIPE';
+	exit !say DIED, "\nCrash (SIG$signame)"   if $sig && ($signame ne 'PIPE' || $ARGV[0] !~ /prog/);
 	exit !say NZX,  "\nNon-zero exit status: " . ($? >> 8) if $? >> 8;
 	exit !say AC,   "\nAll OK";
 } else {
 	$^F = 50;
-	if ($close) {
-		POSIX::close $_ for 0 .. $^F;
-	}
+	POSIX::close 2 unless $keep_stderr;
+	POSIX::close $_ for 0, 1, 3 .. $^F;
 	for my $fdstring (@fds) {
 		my ($fd, $file) = split ' ', $fdstring, 2;
 		open my $fh, $file or die $!;
@@ -90,6 +88,9 @@ if ($ret) {
 	setrlimit RLIMIT_AS, $mlimit, $mlimit or die $! if $mlimit;
 	setrlimit RLIMIT_FSIZE, $olimit, $olimit or die $! if $olimit;
 	setrlimit RLIMIT_NPROC, $nproc, $nproc or die $! if $sudo;
+	open my $adj, '>', '/proc/self/oom_score_adj';
+	print $adj 900;
+	close $adj;
 	unshift @ARGV, @sudo;
 	say STDERR "Executing: ", join ' ', map { "'$_'" } @ARGV if $debug;
 	exec @ARGV;