From b302eb1beaef181ef48e9360c48ed85a3d87aa01 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 1 Nov 2015 08:09:51 +0000 Subject: golf down conditional for socket activation The PID of a process can never be zero as kill(2) interprets a '0' PID arg as "every process in caller's process group", so there's no risk of the 'nil.to_i => 0' conversion resulting in a truth value when compared to $$. --- lib/unicorn/http_server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb index c1a2e60..ca56ed3 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -770,7 +770,7 @@ class Unicorn::HttpServer # emulate sd_listen_fds() for systemd sd_pid, sd_fds = ENV.values_at('LISTEN_PID', 'LISTEN_FDS') - if sd_pid && sd_pid.to_i == $$ + if sd_pid.to_i == $$ # n.b. $$ can never be zero # 3 = SD_LISTEN_FDS_START inherited.concat((3...(3 + sd_fds.to_i)).to_a) end -- cgit v1.2.3-24-ge0c7