From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/5] lei: sto_done_request: add eval guard
Date: Tue, 14 Sep 2021 02:39:02 +0000 [thread overview]
Message-ID: <20210914023905.21410-3-e@80x24.org> (raw)
In-Reply-To: <20210914023905.21410-1-e@80x24.org>
Failures here can cause the lei-daemon event loop to break
since PktOp doesn't guard dispatch. Add a guard here (and
not deeper in the stack) so we can use the $lei object to
report errors.
---
lib/PublicInbox/LEI.pm | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index f0caac03..e529c86a 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -1500,12 +1500,15 @@ sub lms { # read-only LeiMailSync
sub sto_done_request { # only call this from lei-daemon process (not workers)
my ($lei, $sock) = @_;
- if ($sock //= $lei->{sock}) {
- $LIVE_SOCK{"$sock"} = $sock;
- $lei->{sto}->ipc_do('done', "$sock"); # issue, async wait
- } else { # forcibly wait
- my $wait = $lei->{sto}->ipc_do('done');
- }
+ eval {
+ if ($sock //= $lei->{sock}) { # issue, async wait
+ $LIVE_SOCK{"$sock"} = $sock;
+ $lei->{sto}->ipc_do('done', "$sock");
+ } else { # forcibly wait
+ my $wait = $lei->{sto}->ipc_do('done');
+ }
+ };
+ $lei->err($@) if $@;
}
sub sto_done_complete { # called in lei-daemon when LeiStore->done is complete
next prev parent reply other threads:[~2021-09-14 2:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 2:39 [PATCH 0/5] lei: TEST_LEI_DAEMON_PERSIST bugfixes Eric Wong
2021-09-14 2:39 ` [PATCH 1/5] lei: warn on event loop errors Eric Wong
2021-09-14 2:39 ` Eric Wong [this message]
2021-09-14 2:39 ` [PATCH 3/5] t/run: TEST_LEI_DAEMON_PERSIST: die if pid changes Eric Wong
2021-09-14 2:39 ` [PATCH 4/5] test_common: remove non-hidden files, first Eric Wong
2021-09-14 2:39 ` [PATCH 5/5] lei up: fix env/cwd mismatches with multiple folders 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=20210914023905.21410-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).