From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 12/14] qspawn: decode $? for user-friendliness
Date: Sun, 27 Jan 2019 04:03:39 +0000 [thread overview]
Message-ID: <20190127040341.26107-13-e@80x24.org> (raw)
In-Reply-To: <20190127040341.26107-1-e@80x24.org>
The raw value of $? isn't very useful, generally.
---
lib/PublicInbox/Qspawn.pm | 11 ++++++++++-
t/qspawn.t | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 6859a8a..913fac8 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -30,13 +30,22 @@ sub _do_spawn {
$cb->($self->{rpipe});
}
+sub child_err ($) {
+ my ($child_error) = @_; # typically $?
+ my $exitstatus = ($child_error >> 8) or return;
+ my $sig = $child_error & 127;
+ my $msg = "exit status=$exitstatus";
+ $msg .= " signal=$sig" if $sig;
+ $msg;
+}
+
sub finish ($) {
my ($self) = @_;
my $limiter = $self->{limiter};
my $running;
if (delete $self->{rpipe}) {
my $pid = delete $self->{pid};
- $self->{err} = $pid == waitpid($pid, 0) ? $? :
+ $self->{err} = $pid == waitpid($pid, 0) ? child_err($?) :
"PID:$pid still running?";
$running = --$limiter->{running};
}
diff --git a/t/qspawn.t b/t/qspawn.t
index 745ec4d..ab6e375 100644
--- a/t/qspawn.t
+++ b/t/qspawn.t
@@ -31,7 +31,7 @@ my $limiter = PublicInbox::Qspawn::Limiter->new(1);
my ($rpipe) = @_;
is(0, sysread($rpipe, my $buf, 1), 'read zero bytes from false');
my $err = $x->finish;
- is($err, 256, 'error on finish');
+ ok($err, 'error on finish');
$run = 1;
});
is($run, 1, 'callback ran alright');
--
EW
next prev parent reply other threads:[~2019-01-27 4:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-27 4:03 [PATCH 00/14] convert solver to use pi-httpd.async Eric Wong
2019-01-27 4:03 ` [PATCH 01/14] httpd/async: remove needless sysread wrapper Eric Wong
2019-01-27 4:03 ` [PATCH 02/14] qspawn: implement psgi_return and use it for githttpbackend Eric Wong
2019-01-27 4:03 ` [PATCH 03/14] qspawn|getlinebody: support streaming filters Eric Wong
2019-01-27 4:03 ` [PATCH 04/14] qspawn|httpd/async: improve and fix out-of-date comments Eric Wong
2019-01-27 4:03 ` [PATCH 05/14] httpd/async: stop running command if client disconnects Eric Wong
2019-01-27 4:03 ` [PATCH 06/14] qspawn: implement psgi_qx Eric Wong
2019-01-27 4:03 ` [PATCH 07/14] t/qspawn.t: psgi_qx stderr test Eric Wong
2019-01-27 4:03 ` [PATCH 08/14] view: swap CRLF for LF in HTML output Eric Wong
2019-01-27 4:03 ` [PATCH 09/14] solver: rewrite to use Qspawn->psgi_qx and pi-httpd.async Eric Wong
2019-01-27 4:03 ` [PATCH 10/14] solver: hold patches in temporary directory Eric Wong
2019-01-27 4:03 ` [PATCH 11/14] solver: reduce "git apply" invocations Eric Wong
2019-01-27 4:03 ` Eric Wong [this message]
2019-01-27 4:03 ` [PATCH 13/14] viewvcs: do not show final error message twice Eric Wong
2019-01-27 4:03 ` [PATCH 14/14] solver: crank up max patches to 9999 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=20190127040341.26107-13-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).