From 72a315441937f9e0531112f2b7080da39ca6064d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 30 Dec 2010 08:32:24 +0000 Subject: simplify per-client keepalive state checks This lets us simplify repetitive checks worry less about properly maintaining/closing client connections for each concurrency model we support. --- lib/rainbows/coolio/client.rb | 2 +- lib/rainbows/coolio/thread_client.rb | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/rainbows/coolio') diff --git a/lib/rainbows/coolio/client.rb b/lib/rainbows/coolio/client.rb index 7ecea3c..7b41026 100644 --- a/lib/rainbows/coolio/client.rb +++ b/lib/rainbows/coolio/client.rb @@ -125,7 +125,7 @@ class Rainbows::Coolio::Client < Coolio::IO @env[REMOTE_ADDR] = @_io.kgio_addr response = APP.call(@env.update(RACK_DEFAULTS)) - coolio_write_response(response, alive = @hp.next? && G.alive) + coolio_write_response(response, alive = @hp.next?) return quit unless alive && :close != @state @state = :headers disable if enabled? diff --git a/lib/rainbows/coolio/thread_client.rb b/lib/rainbows/coolio/thread_client.rb index 3ada7bf..e6db2bd 100644 --- a/lib/rainbows/coolio/thread_client.rb +++ b/lib/rainbows/coolio/thread_client.rb @@ -14,10 +14,8 @@ class Rainbows::Coolio::ThreadClient < Rainbows::Coolio::Client # this is only called in the master thread def response_write(response) - alive = @hp.next? && G.alive - coolio_write_response(response, alive) + coolio_write_response(response, alive = @hp.next?) return quit unless alive && :close != @state - @state = :headers rescue => e handle_error(e) -- cgit v1.2.3-24-ge0c7