Print debug information in gruntmaster-exec only when needed

[gruntmaster-daemon.git] / gruntmaster-exec

diff --git a/gruntmaster-exec b/gruntmaster-exec
index 25a44d16f48f8635b58868a9f2c9695dab7caf45..bcde8d721321899e0f65cf317ecf8d3d697f4a7e 100755 (executable)
--- a/gruntmaster-exec
+++ b/gruntmaster-exec
@@ -46,7 +46,7 @@ GetOptions(
 my $killuser = $ENV{GRUNTMASTER_KILL_USER};
 my @sudo;
 @sudo = (shellwords ($ENV{GRUNTMASTER_SUDO}), '--') if $ENV{GRUNTMASTER_SUDO} && $nobody;
-$mlimit = 1_000_000_000 if @sudo; # sudo wants a lot of address space
+undef $mlimit if @sudo; # sudo wants a lot of address space
 
 my $ret = fork // die 'Cannot fork';
 if ($ret) {
@@ -88,6 +88,7 @@ if ($ret) {
                }
        }
        my $nproc = $killuser ? 5 : 1;
+       my $debug = $ENV{TEST_VERBOSE};
        %ENV = (ONLINE_JUDGE => 1, PATH => $ENV{PATH}, HOME => $ENV{HOME});
        setrlimit RLIMIT_AS, $mlimit, $mlimit or die $! if $mlimit;
        setrlimit RLIMIT_FSIZE, $olimit, $olimit or die $! if $olimit;
@@ -95,7 +96,7 @@ if ($ret) {
        POSIX::setgid $nobody ? 65534 : USER;
        POSIX::setuid $nobody ? 65534 : GROUP;
        unshift @ARGV, @sudo;
-       say STDERR "Execing: ", join ' ', map { "'$_'" } @ARGV;
+       say STDERR "Executing: ", join ' ', map { "'$_'" } @ARGV if $debug;
        exec @ARGV;
 }