about summary refs log tree commit homepage
path: root/lib/PublicInbox
diff options
context:
space:
mode:
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r--lib/PublicInbox/LEI.pm11
-rw-r--r--lib/PublicInbox/LeiConvert.pm4
-rw-r--r--lib/PublicInbox/LeiP2q.pm4
3 files changed, 8 insertions, 11 deletions
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 0bd52a46..1e720b89 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -481,12 +481,13 @@ sub lei_atfork_child {
 sub workers_start {
         my ($lei, $wq, $ident, $jobs, $ops) = @_;
         $ops = {
-                '!' => [ $lei->can('fail_handler'), $lei ],
-                '|' => [ $lei->can('sigpipe_handler'), $lei ],
-                'x_it' => [ $lei->can('x_it'), $lei ],
-                'child_error' => [ $lei->can('child_error'), $lei ],
-                %$ops
+                '!' => [ \&fail_handler, $lei ],
+                '|' => [ \&sigpipe_handler, $lei ],
+                'x_it' => [ \&x_it, $lei ],
+                'child_error' => [ \&child_error, $lei ],
+                ($ops ? %$ops : ()),
         };
+        $ops->{''} //= [ \&dclose, $lei ];
         require PublicInbox::PktOp;
         ($lei->{pkt_op_c}, $lei->{pkt_op_p}) = PublicInbox::PktOp->pair($ops);
         $wq->wq_workers_start($ident, $jobs, $lei->oldset, { lei => $lei });
diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm
index 0aa13229..8685c194 100644
--- a/lib/PublicInbox/LeiConvert.pm
+++ b/lib/PublicInbox/LeiConvert.pm
@@ -87,9 +87,7 @@ sub lei_convert { # the main "lei convert" method
                 $lei->fail("output not specified or is not a mail destination");
         $lei->{opt}->{augment} = 1 unless $ovv->{dst} eq '/dev/stdout';
         $self->prepare_inputs($lei, \@inputs) or return;
-        my $op = $lei->workers_start($self, 'lei_convert', 1, {
-                '' => [ $lei->can('dclose'), $lei ]
-        });
+        my $op = $lei->workers_start($self, 'lei_convert', 1);
         $self->wq_io_do('do_convert', []);
         $self->wq_close(1);
         while ($op && $op->{sock}) { $op->event_step }
diff --git a/lib/PublicInbox/LeiP2q.pm b/lib/PublicInbox/LeiP2q.pm
index 302d7864..4abe1345 100644
--- a/lib/PublicInbox/LeiP2q.pm
+++ b/lib/PublicInbox/LeiP2q.pm
@@ -182,9 +182,7 @@ sub lei_p2q { # the "lei patch-to-query" entry point
         } else {
                 $self->{input} = $input;
         }
-        my $op = $lei->workers_start($self, 'lei patch2query', 1, {
-                '' => [ $lei->{p2q_done} // $lei->can('dclose'), $lei ]
-        });
+        my $op = $lei->workers_start($self, 'lei patch2query', 1);
         $self->wq_io_do('do_p2q', []);
         $self->wq_close(1);
         while ($op && $op->{sock}) { $op->event_step }