From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 03/12] lei blob: dclose if already failed
Date: Sun, 28 Mar 2021 09:01:15 +0000 [thread overview]
Message-ID: <20210328090124.3541-4-e@80x24.org> (raw)
In-Reply-To: <20210328090124.3541-1-e@80x24.org>
We must close the socket to trigger pager exit if blob
reconstruction fails. Not sure how to test this in the
test suite...
---
lib/PublicInbox/LeiBlob.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/PublicInbox/LeiBlob.pm b/lib/PublicInbox/LeiBlob.pm
index 97747220..9b4c4f30 100644
--- a/lib/PublicInbox/LeiBlob.pm
+++ b/lib/PublicInbox/LeiBlob.pm
@@ -19,7 +19,7 @@ sub sol_done_wait { # dwaitpid callback
sub sol_done { # EOF callback for main daemon
my ($lei) = @_;
- my $sol = delete $lei->{sol} or return;
+ my $sol = delete $lei->{sol} // return $lei->dclose; # already failed
$sol->wq_wait_old(\&sol_done_wait, $lei);
}
next prev parent reply other threads:[~2021-03-28 9:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-28 9:01 [PATCH 00/12] lei blob and some yak-shaving Eric Wong
2021-03-28 9:01 ` [PATCH 01/12] lei: simplify PktOp callers Eric Wong
2021-03-28 9:01 ` [PATCH 02/12] lei init: split out into separate file Eric Wong
2021-03-28 9:01 ` Eric Wong [this message]
2021-03-28 9:01 ` [PATCH 04/12] lei blob: support --no-mail switch Eric Wong
2021-03-28 9:01 ` [PATCH 05/12] lei blob: fail early if no git dirs Eric Wong
2021-03-28 9:01 ` [PATCH 06/12] lei blob: some extra tests Eric Wong
2021-03-28 9:01 ` [PATCH 07/12] lei help: show "NAME=VALUE" properly for -c Eric Wong
2021-03-28 9:01 ` [PATCH 08/12] lei blob: flesh out help text Eric Wong
2021-03-28 9:01 ` [PATCH 09/12] t/lei_store: ensure LeiSearch responds to ->isrch Eric Wong
2021-03-28 9:01 ` [PATCH 10/12] lei blob: add remote external support Eric Wong
2021-03-28 9:01 ` [PATCH 11/12] lei: drop coderepo placeholders, submodule TODO Eric Wong
2021-03-28 9:31 ` Eric Wong
2021-03-28 9:01 ` [PATCH 12/12] treewide: shorten temporary filename 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=20210328090124.3541-4-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).