From 1b3016fbb108d3dbf50ced53012eabbfec4536ea Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 7 Feb 2021 23:05:17 -1000 Subject: [PATCH] lei: drop BSD::Resource usage It's no longer necessary with the changes to stop doing FD passing in our backend. cf. commits 5180ed0a1cd65139 and 7d440bf3667b8ef5 ("lei q: eliminate $not_done temporary git dir hack") ("lei q: reorder internals to reduce FD passing") --- lib/PublicInbox/LEI.pm | 5 ----- script/lei | 8 -------- 2 files changed, 13 deletions(-) diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index cddb94e9..e2a945a4 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -941,11 +941,6 @@ sub lazy_start { $! = $errno; # allow interpolation to stringify in die die "connect($path): $!"; } - if (eval { require BSD::Resource }) { - my $NOFILE = BSD::Resource::RLIMIT_NOFILE(); - my ($s, $h) = BSD::Resource::getrlimit($NOFILE); - BSD::Resource::setrlimit($NOFILE, $h, $h) if $s < $h; - } umask(077) // die("umask(077): $!"); bind($listener, $addr) or die "bind($path): $!"; listen($listener, 1024) or die "listen: $!"; diff --git a/script/lei b/script/lei index 0b0e2976..cb605e2e 100755 --- a/script/lei +++ b/script/lei @@ -82,14 +82,6 @@ Falling back to (slow) one-shot mode while (my ($k, $v) = each %ENV) { $buf .= "\0$k=$v" } $buf .= "\0\0"; my $n = $send_cmd->($sock, [0, 1, 2, fileno($dh)], $buf, MSG_EOR); - if (!$n && $!{ETOOMANYREFS} && eval { require BSD::Resource }) { - my $NOFILE = BSD::Resource::RLIMIT_NOFILE(); - my ($s, $h) = BSD::Resource::getrlimit($NOFILE); - if ($s < $h && BSD::Resource::setrlimit($NOFILE, $h, $h)) { - $n = $send_cmd->($sock, [0, 1, 2, fileno($dh)], - $buf, MSG_EOR); - } - } if (!$n) { die "sendmsg: $! (check RLIMIT_NOFILE)\n" if $!{ETOOMANYREFS}; die "sendmsg: $!\n"; -- 2.44.0