From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 09/13] lei_store: unlink stderr buffer early
Date: Sun, 1 Oct 2023 09:54:25 +0000 [thread overview]
Message-ID: <20231001095429.2092610-10-e@80x24.org> (raw)
In-Reply-To: <20231001095429.2092610-1-e@80x24.org>
While we're at it, ensure we clear the Perl internal EOF
marker before attempting to read the appended-to file
handle since newer Perl may leave the internal EOF marker set.
---
lib/PublicInbox/LeiStore.pm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 727de066..9923ec3f 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -27,7 +27,7 @@ use PublicInbox::MDA;
use PublicInbox::Spawn qw(spawn);
use PublicInbox::MdirReader;
use PublicInbox::LeiToMail;
-use File::Temp ();
+use File::Temp qw(tmpnam);
use POSIX ();
use IO::Handle (); # ->autoflush
use Sys::Syslog qw(syslog openlog);
@@ -110,7 +110,9 @@ sub search {
# follows the stderr file
sub _tail_err {
my ($self) = @_;
- print { $self->{-err_wr} } readline($self->{-tmp_err});
+ my $err = $self->{-tmp_err} // return;
+ $err->clearerr; # clear EOF marker
+ print { $self->{-err_wr} } readline($err);
}
sub eidx_init {
@@ -566,11 +568,10 @@ sub xchg_stderr {
_tail_err($self) if $self->{-err_wr};
my $dir = $self->{priv_eidx}->{topdir};
return unless -e $dir;
- my $old = delete $self->{-tmp_err};
- my $pfx = POSIX::strftime('%Y%m%d%H%M%S', gmtime(time));
- my $err = File::Temp->new(TEMPLATE => "$pfx.$$.err-XXXX",
- SUFFIX => '.err', DIR => $dir);
- open STDERR, '>>', $err->filename or die "dup2: $!";
+ delete $self->{-tmp_err};
+ my ($err, $name) = tmpnam();
+ open STDERR, '>>', $name or die "dup2: $!";
+ unlink($name);
STDERR->autoflush(1); # shared with shard subprocesses
$self->{-tmp_err} = $err; # separate file description for RO access
undef;
next prev parent reply other threads:[~2023-10-01 9:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-01 9:54 [PATCH 00/13] various warning/diagnostic fixes Eric Wong
2023-10-01 9:54 ` [PATCH 01/13] gcf2: take non-ref scalar request arg Eric Wong
2023-10-01 9:54 ` [PATCH 02/13] t/git: show git_version in diag output Eric Wong
2023-10-01 9:54 ` [PATCH 03/13] process_pipe: don't run `close' unless requested Eric Wong
2023-10-01 9:54 ` [PATCH 04/13] git: improve error reporting Eric Wong
2023-10-01 9:54 ` [PATCH 05/13] git: packed_bytes: deal with glob+stat TOCTTOU Eric Wong
2023-10-01 9:54 ` [PATCH 06/13] lei rediff: `git diff -O<order-file>' support Eric Wong
2023-10-01 9:54 ` [PATCH 07/13] lei: correct exit signal Eric Wong
2023-10-01 9:54 ` [PATCH 08/13] lei mail-diff: don't remove temporary subdirectory Eric Wong
2023-10-01 9:54 ` Eric Wong [this message]
2023-10-01 9:54 ` [PATCH 10/13] overidx: fix version comparison Eric Wong
2023-10-01 9:54 ` [PATCH 11/13] treewide: enable warnings in all exec-ed processes Eric Wong
2023-10-01 9:54 ` [PATCH 12/13] lei: ->fail only allows integer exit codes Eric Wong
2023-10-01 9:54 ` [PATCH 13/13] lei: deal with clients with blocked stderr 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=20231001095429.2092610-10-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).