qspawn: shorten lifetime of environ and opts args

We don't need to hold onto the subprocess environ and
redirects/options for popen_rd after spawning the child process.

I do not expect this to fix problem of leaking unlinked regular
file descriptors (which I still can't reproduce), and it
definitely does not fix the problem of leaking pipe descriptors
(which I also can't reproduce).

This will save an FD sooner on non-public-inbox-httpd servers
which give a non-FD $env->{'psgi.input'}, however

Regardless, it's good to free up memory resources in our own
process ASAP we're done using them.

diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 4b9bca5a075cc50ef0ca76e39fcd611606350c56..54976b008d839b302a0d4c262157691f32818a07 100644 (file)
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -56,6 +56,11 @@ sub _do_spawn {
        }
 
        ($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $env, \%opts);
+
+       # drop any IO handles opt was holding open via $opt->{hold}
+       # No need to hold onto the descriptor once the child process has it.
+       $self->{args} = $cmd; # keep this around for logging
+
        if (defined $self->{pid}) {
                $limiter->{running}++;
        } else {
@@ -104,7 +109,7 @@ sub waitpid_err ($$) {
        $self->{err} = $err;
        my $env = $self->{env} or return;
        if (!$env->{'qspawn.quiet'}) {
-               log_err($env, join(' ', @{$self->{args}->[0]}) . ": $err");
+               log_err($env, join(' ', @{$self->{args}}) . ": $err");
        }
 }