lei_to_mail: write directly to mail_sync.sqlite3

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

diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 821045701dfe53398ad89ebddeb7853e54a4a299..66049dfeac84c0cb36cd124b331c85a36395b965 100644 (file)
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -32,6 +32,7 @@ use POSIX ();
 use IO::Handle (); # ->autoflush
 use Sys::Syslog qw(syslog openlog);
 use Errno qw(EEXIST ENOENT);
+use PublicInbox::Syscall qw(rename_noreplace);
 
 sub new {
        my (undef, $dir, $opt) = @_;
@@ -185,10 +186,7 @@ sub export1_kw_md ($$$$$) {
        my $dst = "$mdir/cur/$bn";
        for my $d (@try) {
                my $src = "$mdir/$d/$orig";
-               if (link($src, $dst)) {
-                       if (!unlink($src) and $! != ENOENT) {
-                               syslog('warning', "unlink($src): $!");
-                       }
+               if (rename_noreplace($src, $dst)) {
                        # TODO: verify oidbin?
                        $self->{lms}->mv_src("maildir:$mdir",
                                        $oidbin, \$orig, $bn);
@@ -196,7 +194,7 @@ sub export1_kw_md ($$$$$) {
                } elsif ($! == EEXIST) { # lost race with "lei export-kw"?
                        return;
                } elsif ($! != ENOENT) {
-                       syslog('warning', "link($src -> $dst): $!");
+                       syslog('warning', "rename_noreplace($src -> $dst): $!");
                }
        }
        for (@try) { return if -e "$mdir/$_/$orig" };
@@ -267,11 +265,6 @@ sub _lms_rw ($) { # it is important to have eidx processes open before lms
        };
 }
 
-sub set_sync_info {
-       my ($self, $oidhex, $folder, $id) = @_;
-       _lms_rw($self)->set_src(pack('H*', $oidhex), $folder, $id);
-}
-
 sub _remove_if_local { # git->cat_async arg
        my ($bref, $oidhex, $type, $size, $self) = @_;
        $self->{im}->remove($bref) if $bref;
@@ -351,7 +344,7 @@ sub add_eml {
        $smsg->{-eidx_git} = $eidx->git if !$self->{-fake_im};
        my $im_mark = $im->add($eml, undef, $smsg);
        if ($vmd && $vmd->{sync_info}) {
-               set_sync_info($self, $smsg->{blob}, @{$vmd->{sync_info}});
+               _lms_rw($self)->set_src($smsg->oidbin, @{$vmd->{sync_info}});
        }
        unless ($im_mark) { # duplicate blob returns undef
                return unless wantarray;
@@ -571,6 +564,12 @@ sub recv_and_run {
        $self->SUPER::recv_and_run(@args);
 }
 
+sub _sto_atexit { # dwaitpid callback
+       my ($args, $pid) = @_;
+       my $self = $args->[0];
+       warn "lei/store PID:$pid died \$?=$?\n" if $?;
+}
+
 sub write_prepare {
        my ($self, $lei) = @_;
        $lei // die 'BUG: $lei not passed';
@@ -587,7 +586,7 @@ sub write_prepare {
                                        -err_wr => $w,
                                        to_close => [ $r ],
                                });
-               $self->wq_wait_async; # outlives $lei
+               $self->wq_wait_async(\&_sto_atexit); # outlives $lei
                require PublicInbox::LeiStoreErr;
                PublicInbox::LeiStoreErr->new($r, $lei);
        }