From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 446FF1F56C for ; Sun, 1 Oct 2023 09:54:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1696154071; bh=08To3Cbx4fLmDxzlqp/8Bwv9bMjwvdpA7ym2zrX+hB0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=yja/jQ35JnNdTvnFJgqPpUgj84E4EBUpphX3bu7NC1PPGZvi5zIQwqANb6LdoCOUY QKrCqDcU9gZ5yc40Pz6yaLGVQtxdxnVZSdEnGjdpeGnu4UmreTld+dMHKL/EcKdw1M L+pedAS4XPSw2gSOzpP4/0G2KCRwl9wDZVw8g2QE= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 09/13] lei_store: unlink stderr buffer early Date: Sun, 1 Oct 2023 09:54:25 +0000 Message-ID: <20231001095429.2092610-10-e@80x24.org> In-Reply-To: <20231001095429.2092610-1-e@80x24.org> References: <20231001095429.2092610-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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;