diff options
author | Eric Wong <normalperson@yhbt.net> | 2011-01-05 17:06:20 -0800 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2011-01-06 07:17:19 +0000 |
commit | 6bde32081338ce8075854f4c47ce8ca5347df919 (patch) | |
tree | 71759032be458838eb33f7951172e8572aec4b6d /lib/rainbows/coolio | |
parent | d6e4975937a9590f48dc39b1a4aefa9d62f34616 (diff) | |
download | rainbows-6bde32081338ce8075854f4c47ce8ca5347df919.tar.gz |
Code organization is hard :<
Diffstat (limited to 'lib/rainbows/coolio')
-rw-r--r-- | lib/rainbows/coolio/client.rb | 3 | ||||
-rw-r--r-- | lib/rainbows/coolio/core.rb | 2 | ||||
-rw-r--r-- | lib/rainbows/coolio/heartbeat.rb | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/lib/rainbows/coolio/client.rb b/lib/rainbows/coolio/client.rb index 4a19f31..b5430f6 100644 --- a/lib/rainbows/coolio/client.rb +++ b/lib/rainbows/coolio/client.rb @@ -2,7 +2,6 @@ # :enddoc: class Rainbows::Coolio::Client < Coolio::IO include Rainbows::EvCore - G = Rainbows::G SF = Rainbows::StreamFile CONN = Rainbows::Coolio::CONN KATO = Rainbows::Coolio::KATO @@ -175,7 +174,7 @@ class Rainbows::Coolio::Client < Coolio::IO begin @deferred.close rescue => e - G.server.logger.error("closing #@deferred: #{e}") + Rainbows.server.logger.error("closing #@deferred: #{e}") end @deferred = nil end diff --git a/lib/rainbows/coolio/core.rb b/lib/rainbows/coolio/core.rb index 48907ab..b55cf7f 100644 --- a/lib/rainbows/coolio/core.rb +++ b/lib/rainbows/coolio/core.rb @@ -16,7 +16,7 @@ module Rainbows::Coolio::Core Rainbows::Coolio::Client.const_set(:LOOP, rloop) Rainbows::Coolio::Server.const_set(:MAX, @worker_connections) Rainbows::Coolio::Server.const_set(:CL, mod.const_get(:Client)) - Rainbows::EvCore.const_set(:APP, G.server.app) + 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) } diff --git a/lib/rainbows/coolio/heartbeat.rb b/lib/rainbows/coolio/heartbeat.rb index 4506b84..4657155 100644 --- a/lib/rainbows/coolio/heartbeat.rb +++ b/lib/rainbows/coolio/heartbeat.rb @@ -8,13 +8,12 @@ class Rainbows::Coolio::Heartbeat < Coolio::TimerWatcher KATO = Rainbows::Coolio::KATO CONN = Rainbows::Coolio::CONN - G = Rainbows::G def on_timer if (ot = Rainbows.keepalive_timeout) >= 0 ot = Time.now - ot KATO.delete_if { |client, time| time < ot and client.timeout? } end - exit if (! G.tick && CONN.size <= 0) + exit if (! Rainbows.tick && CONN.size <= 0) end end |