diff options
| -rw-r--r-- | lib/unicorn.rb | 1 | ||||
| -rw-r--r-- | lib/unicorn/http_server.rb | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/unicorn.rb b/lib/unicorn.rb index e7bc9ce..85e4df1 100644 --- a/lib/unicorn.rb +++ b/lib/unicorn.rb @@ -2,6 +2,7 @@ require 'etc' require 'stringio' require 'kgio' +require 'io/wait' begin require 'rack' diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb index bbbca6c..b2bbddb 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -380,7 +380,7 @@ class Unicorn::HttpServer # wait for a signal hander to wake us up and then consume the pipe def master_sleep(sec) - @self_pipe[0].kgio_wait_readable(sec) or return + @self_pipe[0].wait(sec) or return # 11 bytes is the maximum string length which can be embedded within # the Ruby itself and not require a separate malloc (on 32-bit MRI 1.9+). # Most reads are only one byte here and uncommon, so it's not worth a @@ -520,9 +520,6 @@ class Unicorn::HttpServer Unicorn::Configurator::RACKUP.clear @ready_pipe = @init_listeners = @before_exec = @before_fork = nil - # http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/36450 - srand # remove in unicorn 6 - # The OpenSSL PRNG is seeded with only the pid, and apps with frequently # dying workers can recycle pids OpenSSL::Random.seed(rand.to_s) if defined?(OpenSSL::Random) |