lib/PublicInbox/LeiAuth.pm | 2 +- lib/PublicInbox/LeiImport.pm | 4 ++-- lib/PublicInbox/LeiTag.pm | 4 ++-- lib/PublicInbox/LeiToMail.pm | 2 +- lib/PublicInbox/LeiXSearch.pm | 2 +- diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm index e7b26c5fe85bf16a0d61b30202dc8f19939ad187..877ae6a3c081b7bb4d1409f6ef831470a5946d3e 100644 --- a/lib/PublicInbox/LeiAuth.pm +++ b/lib/PublicInbox/LeiAuth.pm @@ -27,7 +27,7 @@ sub net_merge_done1 { # bump merge-count in top-level lei-daemon my ($wq) = @_; return if ++$wq->{nr_net_merge_done} != $wq->{-wq_nr_workers}; - $wq->net_merge_complete; # defined per wq-class (e.g. LeiImport) + $wq->net_merge_all_done; # defined per wq-class (e.g. LeiImport) } sub net_merge_all { # called in wq worker via wq_broadcast diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index def121abbe5b8fd53cdd0fa342ae4a23915d7c21..575cf125803cd63dbc4a048535d0184334550782 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -48,7 +48,7 @@ $vmd->{sync_info} = [ $url, $uid ] if $self->{-mail_sync}; input_eml_cb($self, $eml, $vmd); } -sub net_merge_complete { # callback used by LeiAuth +sub net_merge_all_done { # callback used by LeiAuth my ($self) = @_; $self->wq_io_do('process_inputs'); $self->wq_close(1); @@ -85,7 +85,7 @@ $lei->{-eml_noisy} = 1; (my $op_c, $ops) = $lei->workers_start($self, 'lei-import', $j, $ops); $lei->{wq1} = $self; $lei->{-err_type} = 'non-fatal'; - net_merge_complete($self) unless $lei->{auth}; + net_merge_all_done($self) unless $lei->{auth}; $op_c->op_wait_event($ops); } diff --git a/lib/PublicInbox/LeiTag.pm b/lib/PublicInbox/LeiTag.pm index 989a6954454e709ae98336ee3f05ac89fce2f77b..2170e3f2e7de196723715f7f322fdab75aaa4d13 100644 --- a/lib/PublicInbox/LeiTag.pm +++ b/lib/PublicInbox/LeiTag.pm @@ -19,7 +19,7 @@ } sub input_mbox_cb { input_eml_cb($_[1], $_[0]) } -sub net_merge_complete { # callback used by LeiAuth +sub net_merge_all_done { # callback used by LeiAuth my ($self) = @_; $self->wq_io_do('process_inputs'); $self->wq_close(1); @@ -53,7 +53,7 @@ my $j = $self->{-wq_nr_workers} = 1; # locked for now (my $op_c, $ops) = $lei->workers_start($self, 'lei-tag', $j, $ops); $lei->{wq1} = $self; $lei->{-err_type} = 'non-fatal'; - net_merge_complete($self) unless $lei->{auth}; + net_merge_all_done($self) unless $lei->{auth}; $op_c->op_wait_event($ops); } diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm index a546ab421eeb7c72282f1e72de3a811fbad1f2ed..ab4de3780d042e3df0456416856ce84aab985b74 100644 --- a/lib/PublicInbox/LeiToMail.pm +++ b/lib/PublicInbox/LeiToMail.pm @@ -669,7 +669,7 @@ PublicInbox::PktOp::pkt_do($lei->{pkt_op_p}, 'l2m_progress', $nr); } # called in top-level lei-daemon when LeiAuth is done -sub net_merge_complete { +sub net_merge_all_done { my ($self) = @_; $self->wq_broadcast('do_post_auth'); $self->wq_close(1); diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index e04af0dc8a05d00034a42b3e9f71ba488fbdc0a3..d212a7328683db622d87f745f884fbb546493e20 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -495,7 +495,7 @@ @$end = (); $self->{opt_threads} = $lei->{opt}->{threads}; $self->{opt_sort} = $lei->{opt}->{'sort'}; if ($l2m) { - $l2m->net_merge_complete unless $lei->{auth}; + $l2m->net_merge_all_done unless $lei->{auth}; } else { start_query($self); }