get rid of unnecessary bytes::length usage

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

diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index c5153148362578f6027e76224bd0adaed564743d..39671f902b5514b19657bb7e937a06c935aca76d 100644 (file)
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -8,20 +8,25 @@ use v5.10.1;
 use parent qw(PublicInbox::IPC);
 use IO::Uncompress::Gunzip qw(gunzip $GunzipError);
 use PublicInbox::Spawn qw(popen_rd spawn);
-use PublicInbox::PktOp;
 
 sub do_finish_mirror { # dwaitpid callback
        my ($arg, $pid) = @_;
        my ($mrr, $lei) = @$arg;
-       if ($? == 0 && unlink("$mrr->{dst}/mirror.done")) {
+       my $f = "$mrr->{dst}/mirror.done";
+       if ($?) {
+               $lei->child_error($?);
+       } elsif (!unlink($f)) {
+               $lei->err("unlink($f): $!");
+       } else {
                $lei->add_external_finish($mrr->{dst});
+               $lei->qerr("# mirrored $mrr->{src} => $mrr->{dst}");
        }
        $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);
 }
 
@@ -33,7 +38,7 @@ sub try_scrape {
        my $curl = $self->{curl} //= PublicInbox::LeiCurl->new($lei) or return;
        my $cmd = $curl->for_uri($lei, $uri, '--compressed');
        my $opt = { 0 => $lei->{0}, 2 => $lei->{2} };
-       my $fh = popen_rd($cmd, $lei->{env}, $opt);
+       my $fh = popen_rd($cmd, undef, $opt);
        my $html = do { local $/; <$fh> } // die "read(curl $uri): $!";
        close($fh) or return $lei->child_error($?, "@$cmd failed");
 
@@ -105,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)) {
@@ -143,7 +148,7 @@ sub run_reap {
        my ($lei, $cmd, $opt) = @_;
        $lei->qerr("# @$cmd");
        $opt->{pgid} = 0;
-       my $pid = spawn($cmd, $lei->{env}, $opt);
+       my $pid = spawn($cmd, undef, $opt);
        my $reap = PublicInbox::OnDestroy->new($lei->can('sigint_reap'), $pid);
        my $err = waitpid($pid, 0) == $pid ? undef : "waitpid @$cmd: $!";
        @$reap = (); # cancel reap
@@ -206,7 +211,7 @@ sub try_manifest {
        my $cmd = $curl->for_uri($lei, $uri);
        $lei->qerr("# @$cmd");
        my $opt = { 0 => $lei->{0}, 2 => $lei->{2} };
-       my ($fh, $pid) = popen_rd($cmd, $lei->{env}, $opt);
+       my ($fh, $pid) = popen_rd($cmd, undef, $opt);
        my $reap = PublicInbox::OnDestroy->new($lei->can('sigint_reap'), $pid);
        my $gz = do { local $/; <$fh> } // die "read(curl $uri): $!";
        close $fh;
@@ -263,14 +268,12 @@ sub do_mirror { # via wq_io_do
                return start_clone_url($self) if $self->{src} =~ m!://!;
                die "TODO: cloning local directories not supported, yet";
        };
-       return $lei->fail($@) if $@;
-       $lei->qerr("# mirrored $self->{src} => $self->{dst}");
+       $lei->fail($@) if $@;
 }
 
 sub start {
        my ($cls, $lei, $src, $dst) = @_;
-       my $self = bless { lei => $lei, src => $src, dst => $dst }, $cls;
-       $lei->{mrr} = $self;
+       my $self = bless { src => $src, dst => $dst }, $cls;
        if ($src =~ m!https?://!) {
                require URI;
                require PublicInbox::LeiCurl;
@@ -279,27 +282,16 @@ sub start {
        require PublicInbox::Inbox;
        require PublicInbox::Admin;
        require PublicInbox::InboxWritable;
-       my $ops = {
-               '!' => [ $lei->can('fail_handler'), $lei ],
-               'x_it' => [ $lei->can('x_it'), $lei ],
-               'child_error' => [ $lei->can('child_error'), $lei ],
-               '' => [ \&mirror_done, $lei ],
-       };
-       ($lei->{pkt_op_c}, $lei->{pkt_op_p}) = PublicInbox::PktOp->pair($ops);
-       $self->wq_workers_start('lei_mirror', 1, $lei->oldset, {lei => $lei});
-       my $op = delete $lei->{pkt_op_c};
-       delete $lei->{pkt_op_p};
+       my ($op_c, $ops) = $lei->workers_start($self, 1);
+       $lei->{wq1} = $self;
        $self->wq_io_do('do_mirror', []);
        $self->wq_close(1);
-       $lei->event_step_init; # wait for shutdowns
-       if ($lei->{oneshot}) {
-               while ($op->{sock}) { $op->event_step }
-       }
+       $lei->wait_wq_events($op_c, $ops);
 }
 
 sub ipc_atfork_child {
        my ($self) = @_;
-       $self->{lei}->lei_atfork_child;
+       $self->{lei}->_lei_atfork_child;
        $SIG{TERM} = sub { exit(128 + 15) }; # trigger OnDestroy $reap
        $self->SUPER::ipc_atfork_child;
 }