about summary refs log tree commit homepage
path: root/lib/rainbows
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2011-02-04 18:58:26 -0800
committerEric Wong <normalperson@yhbt.net>2011-02-04 18:58:26 -0800
commit8e2e8adda8adbadee8ab31cde700b7e486b1154c (patch)
treeb4fadc909c9636486ee8e1bebd735786063b9af7 /lib/rainbows
parent0f4f015737297ac5245d0be9ee83553770ade0a9 (diff)
downloadrainbows-8e2e8adda8adbadee8ab31cde700b7e486b1154c.tar.gz
It's too long especially since XEpollThreadPool is planned :>
Diffstat (limited to 'lib/rainbows')
-rw-r--r--lib/rainbows/http_server.rb2
-rw-r--r--lib/rainbows/max_body.rb2
-rw-r--r--lib/rainbows/xepoll.rb (renamed from lib/rainbows/xaccept_epoll.rb)4
-rw-r--r--lib/rainbows/xepoll/client.rb (renamed from lib/rainbows/xaccept_epoll/client.rb)2
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/rainbows/http_server.rb b/lib/rainbows/http_server.rb
index 91c6cad..236c379 100644
--- a/lib/rainbows/http_server.rb
+++ b/lib/rainbows/http_server.rb
@@ -72,7 +72,7 @@ class Rainbows::HttpServer < Unicorn::HttpServer
     new_defaults = {
       'rainbows.model' => (@use = model.to_sym),
       'rack.multithread' => !!(model.to_s =~ /Thread/),
-      'rainbows.autochunk' => [:Coolio,:Rev,:Epoll,:XAcceptEpoll,
+      'rainbows.autochunk' => [:Coolio,:Rev,:Epoll,:XEpoll,
                                :EventMachine,:NeverBlock].include?(@use),
     }
     Rainbows::Const::RACK_DEFAULTS.update(new_defaults)
diff --git a/lib/rainbows/max_body.rb b/lib/rainbows/max_body.rb
index 68ae3e3..fba8b3c 100644
--- a/lib/rainbows/max_body.rb
+++ b/lib/rainbows/max_body.rb
@@ -56,7 +56,7 @@ class Rainbows::MaxBody
     when :Rev, :Coolio, :EventMachine, :NeverBlock,
          :RevThreadSpawn, :RevThreadPool,
          :CoolioThreadSpawn, :CoolioThreadPool,
-         :Epoll, :XAcceptEpoll
+         :Epoll, :XEpoll
       return
     end
 
diff --git a/lib/rainbows/xaccept_epoll.rb b/lib/rainbows/xepoll.rb
index 94ad332..3a02b46 100644
--- a/lib/rainbows/xaccept_epoll.rb
+++ b/lib/rainbows/xepoll.rb
@@ -7,9 +7,9 @@ require 'rainbows/epoll'
 # a (hopefully) native thread.  This is recommended over Epoll for
 # Ruby 1.9 users as it can workaround accept()-scalability issues
 # on multicore machines.
-module Rainbows::XAcceptEpoll
+module Rainbows::XEpoll
   include Rainbows::Base
-  autoload :Client, 'rainbows/xaccept_epoll/client'
+  autoload :Client, 'rainbows/xepoll/client'
 
   def init_worker_process(worker)
     super
diff --git a/lib/rainbows/xaccept_epoll/client.rb b/lib/rainbows/xepoll/client.rb
index f0fecd0..fa5999b 100644
--- a/lib/rainbows/xaccept_epoll/client.rb
+++ b/lib/rainbows/xepoll/client.rb
@@ -1,7 +1,7 @@
 # -*- encoding: binary -*-
 # :enddoc:
 
-module Rainbows::XAcceptEpoll::Client
+module Rainbows::XEpoll::Client
   include Rainbows::Epoll::Client
   MAX = Rainbows.server.worker_connections
   THRESH = MAX - 1