[PATCH 0/2] some CentOS fixes

[PATCH 0/2] some CentOS fixes

[Eric Wong]

Neither of these fix the t/cindex.t stuck problem Konstantin is
encountering, though...

Eric Wong (2):
  lei: use -signal numbers for old Perl
  t/lei-import: account for more verbose error

 lib/PublicInbox/LEI.pm        | 2 +-
 lib/PublicInbox/LeiXSearch.pm | 2 +-
 t/lei-import.t                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

[PATCH 1/2] lei: use -signal numbers for old Perl

[Eric Wong]

Unlike modern Perls, Perl 5.16.3 on CentOS doesn't accept
negative string signals like "-TERM" .

This only became a problem since commit b231d91f42d7
(treewide: enable warnings in all exec-ed processes)
made our code stricter by enabling more warnings.
In both cases, the kill is probably unnecessary and safe
to remove since we can rely on closing sockets to drop
processes.
---
 lib/PublicInbox/LEI.pm        | 2 +-
 lib/PublicInbox/LeiXSearch.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 77acb5a1..69065ce7 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -474,7 +474,7 @@ my @WQ_KEYS = qw(lxs l2m ikw pmd wq1 lne v2w); # internal workers
 sub _drop_wq {
 	my ($self) = @_;
 	for my $wq (grep(defined, delete(@$self{@WQ_KEYS}))) {
-		$wq->wq_kill('-TERM');
+		$wq->wq_kill(-POSIX::SIGTERM());
 		$wq->DESTROY;
 	}
 }
diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index b09c2462..e85fd3c4 100644
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -437,7 +437,7 @@ sub do_post_augment {
 	my $err = $@;
 	if ($err) {
 		if (my $lxs = delete $lei->{lxs}) {
-			$lxs->wq_kill('-TERM');
+			$lxs->wq_kill(-POSIX::SIGTERM());
 			$lxs->wq_close;
 		}
 		$lei->fail("$err");

[PATCH 2/2] t/lei-import: account for more verbose error

[Eric Wong]

Perl 5.16.3 on CentOS seems more verbose in one of the EIO
tests.  Relax the regexp so we can account for extra errors
reported by Perl.
---
 t/lei-import.t | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/lei-import.t b/t/lei-import.t
index bd562617..b4446b56 100644
--- a/t/lei-import.t
+++ b/t/lei-import.t
@@ -172,12 +172,12 @@ SKIP: {
 	tick; # wait for strace to attach
 	ok(!lei(qw(import -F eml t/plack-qp.eml)),
 		'-F eml import fails on pathname error injection');
-	like($lei_err, qr!error reading t/plack-qp\.eml: Input/output error!,
+	like($lei_err, qr!error reading t/plack-qp\.eml: .*Input/output error!,
 		'EIO noted in stderr');
 	open $fh, '<', 't/plack-qp.eml';
 	ok(!lei(qw(import -F eml -), undef, { %$lei_opt, 0 => $fh }),
 		'-F eml import fails on stdin error injection');
-	like($lei_err, qr!error reading .*?: Input/output error!,
+	like($lei_err, qr!error reading .*?: .*Input/output error!,
 		'EIO noted in stderr');
 }