From 7ad4e300c29b06fd53aca9f9bad18f97f9a34633 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 20 Jan 2011 20:32:24 +0000 Subject: ev_core: simplify setup steps ev_core is always loaded after forking, so eliminate the need for extra setup steps for each concurrency model that uses it --- lib/rainbows/coolio/client.rb | 1 + lib/rainbows/coolio/core.rb | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/rainbows/coolio') diff --git a/lib/rainbows/coolio/client.rb b/lib/rainbows/coolio/client.rb index 2947462..6561207 100644 --- a/lib/rainbows/coolio/client.rb +++ b/lib/rainbows/coolio/client.rb @@ -2,6 +2,7 @@ # :enddoc: class Rainbows::Coolio::Client < Coolio::IO include Rainbows::EvCore + APP = Rainbows.server.app CONN = Rainbows::Coolio::CONN KATO = Rainbows::Coolio::KATO LOOP = Coolio::Loop.default diff --git a/lib/rainbows/coolio/core.rb b/lib/rainbows/coolio/core.rb index 8ee0491..cbdadad 100644 --- a/lib/rainbows/coolio/core.rb +++ b/lib/rainbows/coolio/core.rb @@ -7,14 +7,11 @@ module Rainbows::Coolio::Core # for connections and doesn't die until the parent dies (or is # given a INT, QUIT, or TERM signal) def worker_loop(worker) - Rainbows::Response.setup(Rainbows::Coolio::Client) init_worker_process(worker) mod = Rainbows.const_get(@use) rloop = Rainbows::Coolio::Server.const_set(:LOOP, Coolio::Loop.default) Rainbows::Coolio::Server.const_set(:MAX, @worker_connections) Rainbows::Coolio::Server.const_set(:CL, mod.const_get(:Client)) - Rainbows::EvCore.const_set(:APP, Rainbows.server.app) - Rainbows::EvCore.setup Rainbows::Coolio::Heartbeat.new(1, true).attach(rloop) LISTENERS.map! { |s| Rainbows::Coolio::Server.new(s).attach(rloop) } rloop.run -- cgit v1.2.3-24-ge0c7