lei_mail_sync: rely on flock(2), avoid IPC

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

diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index 7580e37e3674a2a0ab1a02a9213d981e80b22315..9084d771cf521cefd8b64c738f0ceec07020bca5 100644 (file)
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -36,7 +36,7 @@ sub pmdir_cb { # called via wq_io_do from LeiPmdir->each_mdir_fn
        my $kw = PublicInbox::MdirReader::flags2kw($fl);
        substr($folder, 0, 0) = 'maildir:'; # add prefix
        my $lse = $self->{lse} //= $self->{lei}->{sto}->search;
-       my $lms = $self->{-lms_ro} //= $lse->lms; # may be 0 or undef
+       my $lms = $self->{-lms_ro} //= $self->{lei}->lms; # may be 0 or undef
        my $oidbin = $lms ? $lms->name_oidbin($folder, $bn) : undef;
        my @docids = defined($oidbin) ? $lse->over->oidbin_exists($oidbin) : ();
        my $vmd = $self->{-import_kw} ? { kw => $kw } : undef;
@@ -83,7 +83,7 @@ sub do_import_index ($$@) {
                # $j = $net->net_concurrency($j); TODO
                if ($lei->{opt}->{incremental} // 1) {
                        $net->{incremental} = 1;
-                       $net->{-lms_ro} = $sto->search->lms // 0;
+                       $net->{-lms_ro} = $lei->lms // 0;
                        if ($self->{-import_kw} && $net->{-lms_ro} &&
                                        !$lei->{opt}->{'new-only'} &&
                                        $net->{imap_order}) {
@@ -101,7 +101,6 @@ sub do_import_index ($$@) {
        }
        my $ops = {};
        $lei->{auth}->op_merge($ops, $self) if $lei->{auth};
-       $self->{-wq_nr_workers} = $j // 1; # locked
        $lei->{-eml_noisy} = 1;
        (my $op_c, $ops) = $lei->workers_start($self, $j, $ops);
        $lei->{wq1} = $self;
@@ -121,8 +120,7 @@ sub _complete_import {
        my $match_cb = $lei->complete_url_prepare(\@argv);
        my @m = map { $match_cb->($_) } $lei->url_folder_cache->keys;
        my %f = map { $_ => 1 } @m;
-       my $sto = $lei->_lei_store;
-       if (my $lms = $sto ? $sto->search->lms : undef) {
+       if (my $lms = $lei->lms) {
                @m = map { $match_cb->($_) } $lms->folders;
                @f{@m} = @m;
        }
@@ -133,6 +131,4 @@ no warnings 'once';
 *ipc_atfork_child = \&PublicInbox::LeiInput::input_only_atfork_child;
 *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done;
 
-# the following works even when LeiAuth is lazy-loaded
-*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all;
 1;