From 07f770c321474751550c4d73c65c27b2b197ac35 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Tue, 12 Mar 2019 01:47:59 +0000
Subject: spawn: require soft and hard entries in RLIMIT_* handling

Our high-level config already treats single limits as a
soft==hard limit for limiters; so stop handling that redundant
in the low-level spawn() sub.
---
 lib/PublicInbox/Spawn.pm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/PublicInbox/Spawn.pm b/lib/PublicInbox/Spawn.pm
index fd981608..7b0f3bdd 100644
--- a/lib/PublicInbox/Spawn.pm
+++ b/lib/PublicInbox/Spawn.pm
@@ -205,18 +205,12 @@ sub spawn ($;$$) {
 
 	foreach my $l (RLIMITS()) {
 		defined(my $v = $opts->{$l}) or next;
-		my ($soft, $hard);
-		if (ref($v)) {
-			($soft, $hard) = @$v;
-		} else {
-			$soft = $hard = $v;
-		}
 		my $r = eval "require BSD::Resource; BSD::Resource::$l();";
 		unless (defined $r) {
 			warn "$l undefined by BSD::Resource: $@\n";
 			next;
 		}
-		push @$rlim, $r, $soft, $hard;
+		push @$rlim, $r, @$v;
 	}
 	my $pid = pi_fork_exec($in, $out, $err, $f, $cmd, \@env, $rlim);
 	$pid < 0 ? undef : $pid;
-- 
cgit v1.2.3-24-ge0c7