imap+nntp: share COMPRESS implementation

[public-inbox.git] / lib / PublicInbox / Emergency.pm

diff --git a/lib/PublicInbox/Emergency.pm b/lib/PublicInbox/Emergency.pm
index 66adc6318076a395aa9c6be81d7a483bff6a151c..5a1ed1d7745bfb4291a19d5b100a7e80fad887be 100644 (file)
--- a/lib/PublicInbox/Emergency.pm
+++ b/lib/PublicInbox/Emergency.pm
@@ -1,66 +1,63 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Emergency Maildir delivery for MDA
 package PublicInbox::Emergency;
 use strict;
-use warnings;
+use v5.10.1;
 use Fcntl qw(:DEFAULT SEEK_SET);
 use Sys::Hostname qw(hostname);
-use IO::Handle;
+use IO::Handle; # ->flush
+use Errno qw(EEXIST);
 
 sub new {
        my ($class, $dir) = @_;
 
-       -d $dir or mkdir($dir) or die "failed to mkdir($dir): $!\n";
        foreach (qw(new tmp cur)) {
                my $d = "$dir/$_";
                next if -d $d;
-               -d $d or mkdir($d) or die "failed to mkdir($d): $!\n";
+               require File::Path;
+               if (!File::Path::mkpath($d) && !-d $d) {
+                       die "failed to mkpath($d): $!\n";
+               }
        }
-       bless { dir => $dir, files => {}, t => 0, cnt => 0, pid => $$ }, $class;
+       bless { dir => $dir, t => 0 }, $class;
 }
 
 sub _fn_in {
-       my ($self, $dir) = @_;
-       my @host = split(/\./, hostname);
+       my ($self, $pid, $dir) = @_;
+       my $host = $self->{short_host} //= (split(/\./, hostname))[0];
        my $now = time;
+       my $n;
        if ($self->{t} != $now) {
                $self->{t} = $now;
-               $self->{cnt} = 0;
+               $n = $self->{cnt} = 0;
        } else {
-               $self->{cnt}++;
+               $n = ++$self->{cnt};
        }
-
-       my $f;
-       do {
-               $f = "$self->{dir}/$dir/$self->{t}.$$"."_$self->{cnt}.$host[0]";
-               $self->{cnt}++;
-       } while (-e $f);
-       $f;
+       "$self->{dir}/$dir/$self->{t}.$pid"."_$n.$host";
 }
 
 sub prepare {
        my ($self, $strref) = @_;
-
-       die "already in transaction: $self->{tmp}" if $self->{tmp};
+       my $pid = $$;
+       my $tmp_key = "tmp.$pid";
+       die "already in transaction: $self->{$tmp_key}" if $self->{$tmp_key};
        my ($tmp, $fh);
        do {
-               $tmp = _fn_in($self, 'tmp');
+               $tmp = _fn_in($self, $pid, 'tmp');
                $! = undef;
-       } while (!sysopen($fh, $tmp, O_CREAT|O_EXCL|O_RDWR) && $!{EEXIST});
+       } while (!sysopen($fh, $tmp, O_CREAT|O_EXCL|O_RDWR) and $! == EEXIST);
        print $fh $$strref or die "write failed: $!";
        $fh->flush or die "flush failed: $!";
-       $fh->autoflush(1);
        $self->{fh} = $fh;
-       $self->{tmp} = $tmp;
+       $self->{$tmp_key} = $tmp;
 }
 
 sub abort {
        my ($self) = @_;
        delete $self->{fh};
-       my $tmp = delete $self->{tmp} or return;
-
+       my $tmp = delete $self->{"tmp.$$"} or return;
        unlink($tmp) or warn "Failed to unlink $tmp: $!";
        undef;
 }
@@ -75,21 +72,15 @@ sub fh {
 
 sub commit {
        my ($self) = @_;
-       $$ == $self->{pid} or return; # no-op in forked child
-
+       my $pid = $$;
+       my $tmp = delete $self->{"tmp.$pid"} or return;
        delete $self->{fh};
-       my $tmp = delete $self->{tmp} or return;
-       my $new;
+       my ($new, $ok);
        do {
-               $new = _fn_in($self, 'new');
-       } while (!link($tmp, $new) && $!{EEXIST});
-       my @sn = stat($new) or die "stat $new failed: $!";
-       my @st = stat($tmp) or die "stat $tmp failed: $!";
-       if ($st[0] == $sn[0] && $st[1] == $sn[1]) {
-               unlink($tmp) or warn "Failed to unlink $tmp: $!";
-       } else {
-               warn "stat($new) and stat($tmp) differ";
-       }
+               $new = _fn_in($self, $pid, 'new');
+       } while (!($ok = link($tmp, $new)) && $! == EEXIST);
+       die "link($tmp, $new): $!" unless $ok;
+       unlink($tmp) or warn "Failed to unlink $tmp: $!";
 }
 
 sub DESTROY { commit($_[0]) }