summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2018-06-01 08:28:22 +0000
committerEric Wong <e@80x24.org>2018-07-23 17:11:54 +0000
commit10f31bcbb901c160f65f98f07e43a33d1728bfda (patch)
tree8d63afa114a5878e0f28ff28855ad69dda7e0fb6
parent440dd1ff1b8b63813998261d5d836b74b69a4109 (diff)
Slowly reducing dependencies on kgio.  'io/wait' is required by
'socket' these days, so it's no extra relocations for .so
loading, either.
-rw-r--r--lib/unicorn.rb1
-rw-r--r--lib/unicorn/http_server.rb2
2 files changed, 2 insertions, 1 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 485cf12..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