www: avoid incorrect instructions for extindex

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

diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index c83386c61ff4717b9f90b63607818d859639a8e2..39671f902b5514b19657bb7e937a06c935aca76d 100644 (file)
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -24,9 +24,9 @@ sub do_finish_mirror { # dwaitpid callback
        $lei->dclose;
 }
 
-sub mirror_done { # EOF callback for main daemon
+sub _lei_wq_eof { # EOF callback for main daemon
        my ($lei) = @_;
-       my $mrr = delete $lei->{mrr} or return;
+       my $mrr = delete $lei->{wq1} or return $lei->fail;
        $mrr->wq_wait_old(\&do_finish_mirror, $lei);
 }
 
@@ -110,7 +110,7 @@ sub _try_config {
        }
        return $lei->err("# @$cmd failed (non-fatal)") if $cerr;
        rename($f, $ce) or return $lei->err("link($f, $ce): $! (non-fatal)");
-       my $cfg = PublicInbox::Config::git_config_dump($f);
+       my $cfg = PublicInbox::Config->git_config_dump($f);
        my $ibx = $self->{ibx} = {};
        for my $sec (grep(/\Apublicinbox\./, @{$cfg->{-section_order}})) {
                for (qw(address newsgroup nntpmirror)) {
@@ -282,13 +282,11 @@ sub start {
        require PublicInbox::Inbox;
        require PublicInbox::Admin;
        require PublicInbox::InboxWritable;
-       my $op = $lei->workers_start($self, 'lei_mirror', 1, {
-               '' => [ \&mirror_done, $lei ]
-       });
-       $lei->{mrr} = $self;
+       my ($op_c, $ops) = $lei->workers_start($self, 1);
+       $lei->{wq1} = $self;
        $self->wq_io_do('do_mirror', []);
        $self->wq_close(1);
-       while ($op && $op->{sock}) { $op->event_step }
+       $lei->wait_wq_events($op_c, $ops);
 }
 
 sub ipc_atfork_child {