lei_xsearch: quiet error message on SIG{PIPE,TERM}

SIGPIPE and SIGTERM are common and user-induced, so they're
not worth warning on.  Add the value of "$?", though, since
it can help users notice other errors (e.g. SIGSEGV).

diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 2a037f2bd79b0af7b4f45051f37e90c1a282a888..29df07e0c8a82e3a97ad620eaa59d4dccb2ee4c2 100644 (file)
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -409,7 +409,10 @@ sub git { $_[0]->{git} // die 'BUG: git uninitialized' }
 sub xsearch_done_wait { # dwaitpid callback
        my ($arg, $pid) = @_;
        my ($wq, $lei) = @$arg;
-       $lei->child_error($?, 'non-fatal error from '.ref($wq)) if $?;
+       return if !$?;
+       my $s = $? & 127;
+       return $lei->child_error($?) if $s == 13 || $s == 15;
+       $lei->child_error($?, 'non-fatal error from '.ref($wq)." \$?=$?");
 }
 
 sub query_done { # EOF callback for main daemon

diff --git a/t/lei-sigpipe.t b/t/lei-sigpipe.t
index f84d6d22ec4d410f77ba9b57ad8c61331ba3a13f..d9738b07bd8e5ddce780e8125b1207a1686cc9ab 100644 (file)
--- a/t/lei-sigpipe.t
+++ b/t/lei-sigpipe.t
@@ -8,7 +8,7 @@ use POSIX qw(WTERMSIG WIFSIGNALED SIGPIPE);
 test_lei(sub {
        my $f = "$ENV{HOME}/big.eml";
        my $imported;
-       for my $out ([], [qw(-f mboxcl2)]) {
+       for my $out ([], [qw(-f mboxcl2)], [qw(-f text)]) {
                pipe(my ($r, $w)) or BAIL_OUT $!;
                my $size = 65536;
                if ($^O eq 'linux' && fcntl($w, 1031, 4096)) {
@@ -27,7 +27,7 @@ EOM
                }
 
                lei_ok(qw(import), $f) if $imported++ == 0;
-               open my $errfh, '>>', "$ENV{HOME}/stderr.log" or xbail $!;
+               open my $errfh, '+>', "$ENV{HOME}/stderr.log" or xbail $!;
                my $opt = { run_mode => 0, 2 => $errfh, 1 => $w };
                my $cmd = [qw(lei q -q -t), @$out, 'z:1..'];
                my $tp = start_script($cmd, undef, $opt);
@@ -37,6 +37,9 @@ EOM
                $tp->join;
                ok(WIFSIGNALED($?), "signaled @$out");
                is(WTERMSIG($?), SIGPIPE, "got SIGPIPE @$out");
+               seek($errfh, 0, 0) or xbail $!;
+               my $s = do { local $/; <$errfh> };
+               is($s, '', "quiet after sigpipe @$out");
        }
 });