diff options
-rw-r--r-- | Documentation/unicorn.1.txt | 4 | ||||
-rw-r--r-- | test/exec/test_exec.rb | 20 |
2 files changed, 21 insertions, 3 deletions
diff --git a/Documentation/unicorn.1.txt b/Documentation/unicorn.1.txt index 193860f..5b82ad5 100644 --- a/Documentation/unicorn.1.txt +++ b/Documentation/unicorn.1.txt @@ -166,9 +166,7 @@ variable internally when doing transparent upgrades. UNICORN_FD is a comma-delimited list of one or more file descriptors used to implement USR2 upgrades. Init systems may bind listen sockets itself and spawn unicorn with UNICORN_FD set to the file descriptor -numbers of the listen socket(s). The unicorn CONFIG_FILE must still -have the inherited listen socket parameters defined as in a normal -startup, otherwise the socket will be closed. +numbers of the listen socket(s). # SEE ALSO diff --git a/test/exec/test_exec.rb b/test/exec/test_exec.rb index af6f151..ca0b7bc 100644 --- a/test/exec/test_exec.rb +++ b/test/exec/test_exec.rb @@ -128,6 +128,26 @@ run lambda { |env| # [ruby-core:69895] [Bug #11336] fixed by r51576 end if RUBY_VERSION.to_f >= 2.3 + def test_inherit_listener_unspecified + File.open("config.ru", "wb") { |fp| fp.write(HI) } + sock = TCPServer.new(@addr, @port) + sock.setsockopt(:SOL_SOCKET, :SO_KEEPALIVE, 0) + + pid = xfork do + redirect_test_io do + ENV['UNICORN_FD'] = sock.fileno.to_s + exec($unicorn_bin, sock.fileno => sock.fileno) + end + end + res = hit(["http://#@addr:#@port/"]) + assert_equal [ "HI\n" ], res + assert_shutdown(pid) + assert_equal 1, sock.getsockopt(:SOL_SOCKET, :SO_KEEPALIVE).int, + 'unicorn should always set SO_KEEPALIVE on inherited sockets' + ensure + sock.close if sock + end + def test_working_directory_rel_path_config_file other = Tempfile.new('unicorn.wd') File.unlink(other.path) |