From 93c6133c0c77259aae362019b2d796bf46e560f9 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 14 Feb 2016 10:32:29 +0000 Subject: doc: trim down documentation slightly The "threads:" option for the "listen" directive is worthless. Having a dedicated thread per-process is already more than enough (and ideal) for a multi-process setup. Multiple acceptor threads is still wrong for a single-process setup (even if we did not have a GVL) as it still incurs contention with the worker pool within the kernel. So remove the documentation regarding "listen ... threads: ", for now; at least until somebody can prove it's useful and not taking up space. Additionally, "atfork_parent" may be useful for restarting background threads/connections if somebody wants to run background jobs in the master process, so stop saying it's completely useless. --- test/test_server.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/test_server.rb b/test/test_server.rb index 65a6ea1..87193e3 100644 --- a/test/test_server.rb +++ b/test/test_server.rb @@ -428,7 +428,7 @@ class TestServer < Testcase worker_processes(1) do atfork_child { puts "af #$$ worker is running" } atfork_prepare { puts "af #$$ parent about to spawn" } - atfork_parent { puts "af #$$ this is probably not useful" } + atfork_parent { puts "af #$$ parent done spawning" } end } stderr_path err.path @@ -457,7 +457,7 @@ class TestServer < Testcase assert_equal("af #{pid} parent about to spawn", lines.shift) # child/parent ordering is not guaranteed - assert_equal 1, lines.grep(/\Aaf #{pid} this is probably not useful\z/).size + assert_equal 1, lines.grep(/\Aaf #{pid} parent done spawning\z/).size assert_equal 1, lines.grep(/\Aaf #{worker_pid} worker is running\z/).size ensure quit_wait(master_pid) @@ -479,7 +479,7 @@ class TestServer < Testcase worker_processes(1) do atfork_child { |nr| puts "af.#{nr} #$$ worker is running" } atfork_prepare { |nr| puts "af.#{nr} #$$ parent about to spawn" } - atfork_parent { |nr| puts "af.#{nr} #$$ this is probably not useful" } + atfork_parent { |nr| puts "af.#{nr} #$$ parent done spawning" } end } stderr_path err.path @@ -503,7 +503,7 @@ class TestServer < Testcase # child/parent ordering is not guaranteed assert_equal 1, - lines.grep(/\Aaf\.0 #{pid} this is probably not useful\z/).size + lines.grep(/\Aaf\.0 #{pid} parent done spawning\z/).size assert_equal 1, lines.grep(/\Aaf\.0 #{worker_pid} worker is running\z/).size ensure -- cgit v1.2.3-24-ge0c7