treewide: "require" + "use" cleanup and docs

[public-inbox.git] / lib / PublicInbox / Qspawn.pm

diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index d1a34beac89ffd89c38083a0526be6e534395b8d..65bb178aba44a216f73c221338aebd5f7a9dba92 100644 (file)
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -56,9 +56,7 @@ sub _do_spawn {
 
        ($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $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
+       $self->{args} = $opts{quiet} ? undef : $cmd;
 
        if (defined $self->{pid}) {
                $limiter->{running}++;
@@ -108,7 +106,7 @@ sub waitpid_err ($$) {
 
        if ($err) {
                $self->{err} = $err;
-               if ($env && !$env->{'qspawn.quiet'}) {
+               if ($env && $self->{args}) {
                        log_err($env, join(' ', @{$self->{args}}) . ": $err");
                }
        }
@@ -215,12 +213,13 @@ sub rd_hdr ($) {
        my $ret;
        my $total_rd = 0;
        my $hdr_buf = $self->{hdr_buf};
+       my ($ph_cb, $ph_arg) = @{$self->{parse_hdr}};
        do {
                my $r = sysread($self->{rpipe}, $$hdr_buf, 4096,
                                length($$hdr_buf));
                if (defined($r)) {
                        $total_rd += $r;
-                       $ret = $self->{parse_hdr}->($total_rd, $hdr_buf);
+                       $ret = $ph_cb->($total_rd, $hdr_buf, $ph_arg);
                } else {
                        # caller should notify us when it's ready:
                        return if $! == EAGAIN;
@@ -298,10 +297,10 @@ sub psgi_return_start { # may run later, much later...
 #              psgix.io.  3-element arrays means the body is available
 #              immediately (or streamed via ->getline (pull-based)).
 sub psgi_return {
-       my ($self, $env, $limiter, $parse_hdr) = @_;
+       my ($self, $env, $limiter, $parse_hdr, $hdr_arg) = @_;
        $self->{psgi_env} = $env;
        $self->{hdr_buf} = \(my $hdr_buf = '');
-       $self->{parse_hdr} = $parse_hdr;
+       $self->{parse_hdr} = [ $parse_hdr, $hdr_arg ];
        $limiter ||= $def_limiter ||= PublicInbox::Qspawn::Limiter->new(32);
 
        # the caller already captured the PSGI write callback from