about summary refs log tree commit homepage
path: root/lib/rainbows/coolio
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2011-01-20 20:32:24 +0000
committerEric Wong <normalperson@yhbt.net>2011-01-20 20:32:24 +0000
commit7ad4e300c29b06fd53aca9f9bad18f97f9a34633 (patch)
tree4d04679ace5f876e642b6b091deb18025b10c9d1 /lib/rainbows/coolio
parent72cbecfe01b8c4b2c7bb7e362401805374036dc2 (diff)
downloadrainbows-7ad4e300c29b06fd53aca9f9bad18f97f9a34633.tar.gz
ev_core is always loaded after forking, so eliminate the
need for extra setup steps for each concurrency model that
uses it
Diffstat (limited to 'lib/rainbows/coolio')
-rw-r--r--lib/rainbows/coolio/client.rb1
-rw-r--r--lib/rainbows/coolio/core.rb3
2 files changed, 1 insertions, 3 deletions
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