From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/3] lei2mail: augment_inprogress: guard against closed FDs
Date: Sat, 25 Sep 2021 05:49:45 +0000 [thread overview]
Message-ID: <20210925054945.12715-4-e@80x24.org> (raw)
In-Reply-To: <20210925054945.12715-1-e@80x24.org>
I'm not sure what caused it, but $err was undef and caused print
to fail, leading to an event loop error. Guard the timer with
an eval and assume warn() can't trigger an event loop failure.
---
lib/PublicInbox/LeiToMail.pm | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index ed609081b0a4..467b27bf275d 100644
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -789,12 +789,15 @@ sub wq_atexit_child {
# runs on a 1s timer in lei-daemon
sub augment_inprogress {
my ($err, $opt, $dst, $au_noted) = @_;
- $$au_noted++ and return;
- print $err '# '.($opt->{'import-before'} ?
- "importing non-external contents of $dst" : (
- ($opt->{dedupe} // 'content') ne 'none') ?
- "scanning old contents of $dst for dedupe" :
- "removing old contents of $dst")." ...\n";
+ eval {
+ return if $$au_noted++ || !$err || !defined(fileno($err));
+ print $err '# '.($opt->{'import-before'} ?
+ "importing non-external contents of $dst" : (
+ ($opt->{dedupe} // 'content') ne 'none') ?
+ "scanning old contents of $dst for dedupe" :
+ "removing old contents of $dst")." ...\n";
+ };
+ warn "E: $@" if $@;
}
# called in top-level lei-daemon when LeiAuth is done
prev parent reply other threads:[~2021-09-25 5:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-25 5:49 [PATCH 0/3] lei: some robustness fixes Eric Wong
2021-09-25 5:49 ` [PATCH 1/3] lei up: show timezone offset with localtime Eric Wong
2021-09-25 5:49 ` [PATCH 2/3] lei: restore old sigmask before daemon exit Eric Wong
2021-09-25 5:49 ` Eric Wong [this message]
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=20210925054945.12715-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.
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).