diff options
| author | Eric Wong <e@80x24.org> | 2020-01-02 09:24:59 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2020-01-03 02:29:15 +0000 |
| commit | 3ac73bd16d9fa7beba6a1735dd5c505d021e227a (patch) | |
| tree | 2d05f54b8bb04f514d2416dfbcb440b80aae5f0a /lib/PublicInbox/Qspawn.pm | |
| parent | bea4ca3427a7be4b943aee42593ffc28823637fd (diff) | |
| download | public-inbox-3ac73bd16d9fa7beba6a1735dd5c505d021e227a.tar.gz | |
solver can spawn multiple processes per HTTP request, but
"git apply" failures are needlessly noisy due to corrupt
patches. We also don't want to silence "git ls-files"
or "git update-index" errors using $env->{'qspawn.quiet'},
either, so this granularity is needed.
Admins can check for 500 errors in access logs to detect
(and reproduce) solver failures, anyways, so there's no
need to log every time "git apply" rejects a corrupt patch.
Diffstat (limited to 'lib/PublicInbox/Qspawn.pm')
| -rw-r--r-- | lib/PublicInbox/Qspawn.pm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm index 1a2b70e7..65bb178a 100644 --- 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"); } } |