diff options
| author | Eric Wong <e@80x24.org> | 2022-11-28 05:32:17 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2022-11-28 23:38:58 +0000 |
| commit | 7cb5dac3b11acf0d79f599a060cd56d3b73162b1 (patch) | |
| tree | faae067908a15eee19584be7354943dbf5d99cd6 /lib/PublicInbox | |
| parent | 6db94da4d12a8139dca911a4824386838ba4e6d2 (diff) | |
| download | public-inbox-7cb5dac3b11acf0d79f599a060cd56d3b73162b1.tar.gz | |
This makes a fundamental (and overdue) change to the core of lei in how it handles child errors. Every process which generates or receives a child error will remember it before passing it on. This ensures _wq_done_wait callbacks will know of prior errors aside from $? when it runs.
Diffstat (limited to 'lib/PublicInbox')
| -rw-r--r-- | lib/PublicInbox/LEI.pm | 3 | ||||
| -rw-r--r-- | lib/PublicInbox/LeiMirror.pm | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index 8a14ace4..b78d70de 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -544,12 +544,11 @@ sub child_error { # passes non-fatal curl exit codes to user local $current_lei = $self; $child_error ||= 1 << 8; warn(substr($msg, -1, 1) eq "\n" ? $msg : "$msg\n") if defined $msg; + $self->{child_error} ||= $child_error; if ($self->{pkt_op_p}) { # to top lei-daemon $self->{pkt_op_p}->pkt_do('child_error', $child_error); } elsif ($self->{sock}) { # to lei(1) client send($self->{sock}, "child_error $child_error", MSG_EOR); - } else { # non-lei admin command - $self->{child_error} ||= $child_error; } # else noop if client disconnected } diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm index b982f919..b8b6b504 100644 --- a/lib/PublicInbox/LeiMirror.pm +++ b/lib/PublicInbox/LeiMirror.pm @@ -30,12 +30,9 @@ sub keep_going ($) { sub _wq_done_wait { # dwaitpid callback (via wq_eof) my ($arg, $pid) = @_; my ($mrr, $lei) = @$arg; - my $f = "$mrr->{dst}/mirror.done"; if ($?) { $lei->child_error($?); - } elsif (!$mrr->{dry_run} && !unlink($f)) { - warn("unlink($f): $!\n") unless $!{ENOENT}; - } else { + } elsif (!$lei->{child_error}) { if (!$mrr->{dry_run} && $lei->{cmd} ne 'public-inbox-clone') { require PublicInbox::LeiAddExternal; PublicInbox::LeiAddExternal::_finish_add_external( @@ -249,7 +246,6 @@ sub index_cloned_inbox { PublicInbox::Admin::index_inbox($ibx, undef, $opt); } return if defined $self->{cur_dst}; # one of many repos to clone - open my $x, '>', "$self->{dst}/mirror.done"; # for _wq_done_wait } sub run_reap { @@ -1082,7 +1078,6 @@ EOM } dump_manifest($m => $ft) if delete($self->{chg}->{manifest}) || $mis; ft_rename($ft, $manifest, 0666); - open my $x, '>', "$self->{dst}/mirror.done"; # for _wq_done_wait } sub start_clone_url { |