Code is the enemy, and there's no need to duplicate things, here.
There may be further opportunities along these lines to further
deduplicate things...
$? = $err if $err; # preserve ->fail or ->x_it code
}
$? = $err if $err; # preserve ->fail or ->x_it code
}
+sub wq_done_wait { # dwaitpid callback
+ my ($arg, $pid) = @_;
+ my ($wq, $lei, $e) = @$arg;
+ $? and $lei->child_error($?, $e ? "$e errors during $lei->{cmd}" : ());
+ $lei->dclose;
+}
+
use PublicInbox::Spawn qw(spawn popen_rd which);
use PublicInbox::DS;
use PublicInbox::Spawn qw(spawn popen_rd which);
use PublicInbox::DS;
-sub sol_done_wait { # dwaitpid callback
- my ($arg, $pid) = @_;
- my (undef, $lei) = @$arg;
- $lei->child_error($?) if $?;
- $lei->dclose;
-}
-
sub sol_done { # EOF callback for main daemon
my ($lei) = @_;
my $sol = delete $lei->{sol} // return $lei->dclose; # already failed
sub sol_done { # EOF callback for main daemon
my ($lei) = @_;
my $sol = delete $lei->{sol} // return $lei->dclose; # already failed
- $sol->wq_wait_old(\&sol_done_wait, $lei);
+ $sol->wq_wait_old($lei->can('wq_done_wait'), $lei);
input_eml_cb($self, $eml, $self->{-import_kw} ? { kw => $kw } : undef);
}
input_eml_cb($self, $eml, $self->{-import_kw} ? { kw => $kw } : undef);
}
-sub import_done_wait { # dwaitpid callback
- my ($arg, $pid) = @_;
- my ($imp, $lei) = @$arg;
- $lei->child_error($?, 'non-fatal errors during import') if $?;
- $lei->dclose;
-}
-
sub import_done { # EOF callback for main daemon
my ($lei) = @_;
my $imp = delete $lei->{imp} // return $lei->fail('BUG: {imp} gone');
sub import_done { # EOF callback for main daemon
my ($lei) = @_;
my $imp = delete $lei->{imp} // return $lei->fail('BUG: {imp} gone');
- $imp->wq_wait_old(\&import_done_wait, $lei);
+ $imp->wq_wait_old($lei->can('wq_done_wait'), $lei, 'non-fatal');
}
sub net_merge_complete { # callback used by LeiAuth
}
sub net_merge_complete { # callback used by LeiAuth
sub input_mbox_cb { input_eml_cb($_[1], $_[0]) }
sub input_mbox_cb { input_eml_cb($_[1], $_[0]) }
-sub tag_done_wait { # dwaitpid callback
- my ($arg, $pid) = @_;
- my ($tag, $lei) = @$arg;
- $lei->child_error($?, 'non-fatal errors during tag') if $?;
- $lei->dclose;
-}
-
sub tag_done { # EOF callback for main daemon
my ($lei) = @_;
my $tag = delete $lei->{tag} or return;
sub tag_done { # EOF callback for main daemon
my ($lei) = @_;
my $tag = delete $lei->{tag} or return;
- $tag->wq_wait_old(\&tag_done_wait, $lei);
+ $tag->wq_wait_old($lei->can('wq_done_wait'), $lei, 'non-fatal');
}
sub net_merge_complete { # callback used by LeiAuth
}
sub net_merge_complete { # callback used by LeiAuth