user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/4] qspawn: {quiet} only affects normal command exit
Date: Thu, 19 Jan 2023 20:32:34 +0000	[thread overview]
Message-ID: <20230119203237.2277543-2-e@80x24.org> (raw)
In-Reply-To: <20230119203237.2277543-1-e@80x24.org>

{quiet} is nice for quieting normal/expected errors (e.g `git diff'),
but we still want to show the command in case there's errors in
our own code.
---
 lib/PublicInbox/Qspawn.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 78afe718..c4708c0f 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -57,7 +57,8 @@ sub _do_spawn {
 			$o{$k} = $rlimit;
 		}
 	}
-	$self->{cmd} = $o{quiet} ? undef : $cmd;
+	$self->{cmd} = $cmd;
+	$self->{-quiet} = 1 if $o{quiet};
 	$o{cb_arg} = [ \&waitpid_err, $self ];
 	eval {
 		# popen_rd may die on EMFILE, ENFILE
@@ -85,7 +86,7 @@ sub finalize ($) {
 		if (my $dst = $self->{qsp_err}) {
 			$$dst .= $$dst ? " $err" : "; $err";
 		}
-		warn "@{$self->{cmd}}: $err" if $self->{cmd};
+		warn "@{$self->{cmd}}: $err" if !$self->{-quiet};
 	}
 
 	my ($env, $qx_cb, $qx_arg, $qx_buf) =
@@ -216,9 +217,8 @@ sub rd_hdr ($) {
 				warn "parse_hdr: $@";
 				$ret = [ 500, [], [ "Internal error\n" ] ];
 			} elsif (!defined($ret) && !$r) {
-				my $cmd = $self->{cmd} // [ '(?)' ];
 				warn <<EOM;
-EOF parsing headers from @$cmd ($self->{psgi_env}->{REQUEST_URI})
+EOF parsing headers from @{$self->{cmd}} ($self->{psgi_env}->{REQUEST_URI})
 EOM
 				$ret = [ 500, [], [ "Internal error\n" ] ];
 			}

  reply	other threads:[~2023-01-19 20:32 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-19 20:32 [PATCH 0/4] qspawn|awaitpid error handling improvements Eric Wong
2023-01-19 20:32 ` Eric Wong [this message]
2023-01-19 20:32 ` [PATCH 2/4] qspawn: psgi_qx: do not call async_pass on errors Eric Wong
2023-01-19 20:32 ` [PATCH 3/4] ds: improve error handling of synchronous awaitpid Eric Wong
2023-01-19 20:32 ` [PATCH 4/4] qspawn: drop unnecessary awaitpid import Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230119203237.2277543-2-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).