Allow the exit code to be the first argument intead of the last
to match our ->child_error, as well as the BSD err(3) API.
We'll also avoid shifting user-passed exit codes so $? can be
passed as-is without losing signal information.
---
lib/PublicInbox/LEI.pm | 19 ++++++++++++-------
lib/PublicInbox/LeiToMail.pm | 2 +-
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index c61ce76d..368f9357 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -29,6 +29,7 @@ use File::Path ();
use File::Spec;
use Carp ();
use Sys::Syslog qw(openlog syslog closelog);
+use Scalar::Util qw(looks_like_number);
our $quit = \&CORE::exit;
our ($current_lei, $errors_log, $listener, $oldset, $dir_idle);
my $GLP = Getopt::Long::Parser->new;
@@ -518,13 +519,17 @@ sub sigpipe_handler { # handles SIGPIPE from @WQ_KEYS
workers
fail_handler($_[0], 13, delete $_[0]->{1});
}
-sub fail ($$;$) {
- my ($self, $msg, $exit_code) = @_;
- local $current_lei = $self;
- $self->{failed}++;
- warn(substr($msg, -1, 1) eq "\n" ? $msg : "$msg\n") if defined $msg;
- $self->{pkt_op_p}->pkt_do('fail_handler') if $self->{pkt_op_p};
- x_it($self, ($exit_code // 1) << 8);
+sub fail ($;@) {
+ my ($lei, @msg) = @_;
+ my $exit_code = looks_like_number($msg[0]) ? shift(@msg) : undef;
+ local $current_lei = $lei;
+ $lei->{failed}++;
+ if (@msg) {
+ push @msg, "\n" if substr($msg[-1], -1, 1);
+ warn @msg;
+ }
+ $lei->{pkt_op_p}->pkt_do('fail_handler') if $lei->{pkt_op_p};
+ x_it($lei, $exit_code // (1 << 8));
undef;
}
diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index e357ee00..7c7967c8 100644
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -154,7 +154,7 @@ sub reap_compress { # awaitpid callback
my ($pid, $lei) = @_;
my $cmd = delete $lei->{"pid.$pid"};
return if $? == 0;
- $lei->fail("@$cmd failed", $? >> 8);
+ $lei->fail($?, "@$cmd failed");
}
sub _post_augment_mbox { # open a compressor process from top-level process
