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 09CCB1F570 for ; Sun, 1 Oct 2023 02:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1696128206; bh=/6QirbVocPB1MXUgsBY/7S+JC5GgpBeQYsp60pptAns=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZLnVzVwDL+WalZiA0kYjnGGegv8XE9czFJcwLh1XGc7RaPVdtDrhGgN6cPG+skkPM RMf7KG1cr1YQPAfadegdBzH1y6lUhbKRiQxQYyHvwxewY6bJo8PsYDpkvhVmZPcBYe D2wZMKGM35WnALltzcAhj6fppd7JvFezFBEsNc6I= From: Eric Wong To: spew@80x24.org Subject: [PATCH 14/16] lei_store: unlink early Date: Sun, 1 Oct 2023 02:43:21 +0000 Message-ID: <20231001024323.1960491-14-e@80x24.org> In-Reply-To: <20231001024323.1960491-1-e@80x24.org> References: <20231001024323.1960491-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: --- lib/PublicInbox/LeiStore.pm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm index 727de066..e97931dd 100644 --- a/lib/PublicInbox/LeiStore.pm +++ b/lib/PublicInbox/LeiStore.pm @@ -27,7 +27,8 @@ use PublicInbox::MDA; use PublicInbox::Spawn qw(spawn); use PublicInbox::MdirReader; use PublicInbox::LeiToMail; -use File::Temp (); +use File::Temp qw(tmpnam); +use Fcntl qw(SEEK_CUR); use POSIX (); use IO::Handle (); # ->autoflush use Sys::Syslog qw(syslog openlog); @@ -110,6 +111,7 @@ sub search { # follows the stderr file sub _tail_err { my ($self) = @_; + seek($self->{-tmp_err} // return, 0, SEEK_CUR); print { $self->{-err_wr} } readline($self->{-tmp_err}); } @@ -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;