lei: share common *done_wait callbacks

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...

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 8fa8994488e12ae82ca22503bbfad095ae4ca0eb..2e1aa2469559ba49fbee00d827ab3017474c3cb0 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -1211,4 +1211,11 @@ sub DESTROY {
        $? = $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;
+}
+
 1;

diff --git a/lib/PublicInbox/LeiBlob.pm b/lib/PublicInbox/LeiBlob.pm
index ad885306beaa20c17ac6bb31e3bb4dc65bbca76e..e4cd4cca58fb10266d0b089da2f79f8cf704db6f 100644 (file)
--- a/lib/PublicInbox/LeiBlob.pm
+++ b/lib/PublicInbox/LeiBlob.pm
@@ -10,17 +10,10 @@ use parent qw(PublicInbox::IPC);
 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
-       $sol->wq_wait_old(\&sol_done_wait, $lei);
+       $sol->wq_wait_old($lei->can('wq_done_wait'), $lei);
 }
 
 sub get_git_dir ($$) {

diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index d33143ef2c486f1da4050b9cb863c025d4160f60..1627160387ba8257fa97bf27ecbc68b701b93237 100644 (file)
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -35,17 +35,10 @@ sub input_net_cb { # imap_each, nntp_each cb
        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');
-       $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

diff --git a/lib/PublicInbox/LeiTag.pm b/lib/PublicInbox/LeiTag.pm
index 1dfc841d6941b2effccb33c1c2ee232bb8a3e0af..f019202f4ae216a9d25058c2a04d13d9abfcdff1 100644 (file)
--- a/lib/PublicInbox/LeiTag.pm
+++ b/lib/PublicInbox/LeiTag.pm
@@ -71,17 +71,10 @@ sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh
 
 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;
-       $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