From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/7] git: async_err shows retried requests properly
Date: Thu, 14 Oct 2021 13:16:04 +0000 [thread overview]
Message-ID: <20211014131609.829-3-e@80x24.org> (raw)
In-Reply-To: <20211014131609.829-1-e@80x24.org>
We make $req a reference upon retrying, but
"SCALAR(...)" in error messages isn't helpful, so
dereference the scalar ref.
---
lib/PublicInbox/Git.pm | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 7c08be47bbe4..016dd2ae30e9 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -19,7 +19,7 @@ use Time::HiRes qw(stat);
use PublicInbox::Spawn qw(popen_rd spawn);
use PublicInbox::Tmpfile;
use IO::Poll qw(POLLIN);
-use Carp qw(croak);
+use Carp qw(croak carp);
use Digest::SHA ();
use PublicInbox::DS qw(dwaitpid);
our @EXPORT_OK = qw(git_unquote git_quote);
@@ -228,7 +228,7 @@ sub cat_async_step ($$) {
}
$self->{rbuf} = $rbuf if $$rbuf ne '';
eval { $cb->($bref, $oid, $type, $size, $arg) };
- async_err($self, "E: cat $req ($oid) $@") if $@;
+ async_err($self, $req, $oid, $@, 'cat') if $@;
}
sub cat_async_wait ($) {
@@ -274,7 +274,7 @@ sub check_async_step ($$) {
}
$self->{rbuf_c} = $rbuf if $$rbuf ne '';
eval { $cb->($hex, $type, $size, $arg, $self) };
- async_err($self, "E: check $req ($hex) $@") if $@;
+ async_err($self, $req, $hex, $@, 'check') if $@;
}
sub check_async_wait ($) {
@@ -342,6 +342,7 @@ sub async_abort ($) {
my $q = $self->{"inflight$c"};
while (@$q) {
my ($req, $cb, $arg) = splice(@$q, 0, 3);
+ $req = $$req if ref($req);
$req =~ s/ .*//; # drop git_dir for Gcf2Client
eval { $cb->(undef, $req, undef, undef, $arg) };
warn "E: (in abort) $req: $@" if $@;
@@ -359,10 +360,11 @@ sub fail { # may be augmented in subclasses
croak(ref($self) . ' ' . ($self->{git_dir} // '') . ": $msg");
}
-sub async_err ($$) {
- my ($self, $msg) = @_;
- return warn($msg) if $async_warn;
- $self->fail($msg);
+sub async_err ($$$$$) {
+ my ($self, $req, $oid, $err, $action) = @_;
+ $req = $$req if ref($req); # retried
+ my $msg = "E: $action $req ($oid): $err";
+ $async_warn ? carp($msg) : $self->fail($msg);
}
# $git->popen(qw(show f00)); # or
next prev parent reply other threads:[~2021-10-14 13:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-14 4:32 [PATCH 0/3] clone+fetch stuff Eric Wong
2021-10-14 4:32 ` [PATCH 1/3] clone+fetch: respect umask for all downloaded files Eric Wong
2021-10-14 4:32 ` [PATCH 2/3] lei add-external --mirror: respect client umask Eric Wong
2021-10-14 4:32 ` [PATCH 3/3] lei: give workers their own process group Eric Wong
2021-10-14 13:16 ` [PATCH 0/7] lei: more process handling fixes Eric Wong
2021-10-14 13:16 ` [PATCH 1/7] lei: use send() perlop for signals Eric Wong
2021-10-14 13:16 ` Eric Wong [this message]
2021-10-14 13:16 ` [PATCH 3/7] git: ->fail invokes current callback Eric Wong
2021-10-14 13:16 ` [PATCH 4/7] git: cat-file --batch are their own pgrp Eric Wong
2021-10-14 13:16 ` [PATCH 5/7] lei: TSTP affects all curl and related subprocesses Eric Wong
2021-10-14 13:16 ` [PATCH 6/7] lei up: actually rely on DESTROY for --alllll Eric Wong
2021-10-14 13:16 ` [PATCH 7/7] lei up --all: send signals to workers, receive errors 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=20211014131609.829-3-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.
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).