From 17ca034f1283dfa73b8c3be25fc76dc0d111fe65 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 28 Oct 2015 02:03:45 +0000 Subject: simplify sd_listen_fds emulation Remove unnecessary anonymous procs and conditionals to save some bytecode memory Also, no valid PID can be zero, as kill(2) treats zero specially. --- lib/yahns/server.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/yahns/server.rb b/lib/yahns/server.rb index 4501d86..2db8baf 100644 --- a/lib/yahns/server.rb +++ b/lib/yahns/server.rb @@ -316,14 +316,14 @@ class Yahns::Server # :nodoc: # 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 == $$ # 3 = SD_LISTEN_FDS_START - inherited.concat((3...(3 + sd_fds.to_i)).map { |fd| Socket.for_fd(fd) }) + inherited.concat((3...(3 + sd_fds.to_i)).to_a) end # to ease debugging, we will not unset LISTEN_PID and LISTEN_FDS inherited.map! do |fd| - io = String === fd ? Socket.for_fd(fd.to_i) : fd + io = Socket.for_fd(fd.to_i) opts = sock_opts(io) io = server_cast(io, opts) set_server_sockopt(io, opts) -- cgit v1.2.3-24-ge0c7