From e9152a8463d62e46a772843f66ddedef52cd0b2c Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 27 Oct 2009 01:20:47 -0700 Subject: revactor: require 0.1.5, remove 0.1.4 workarounds Also new are added basic HTTP tests for UNIX domain socket handling (for all models, now, of course). --- lib/rainbows/revactor.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'lib/rainbows') diff --git a/lib/rainbows/revactor.rb b/lib/rainbows/revactor.rb index d9f246b..ddcbc04 100644 --- a/lib/rainbows/revactor.rb +++ b/lib/rainbows/revactor.rb @@ -1,9 +1,6 @@ # -*- encoding: binary -*- require 'revactor' - -# workaround revactor 0.1.4 still using the old Rev::Buffer -# ref: http://rubyforge.org/pipermail/revactor-talk/2009-October/000034.html -defined?(Rev::Buffer) or Rev::Buffer = IO::Buffer +Revactor::VERSION >= '0.1.5' or abort 'revactor 0.1.5 is required' module Rainbows @@ -137,16 +134,13 @@ module Rainbows def revactorize_listeners! LISTENERS.map! do |s| - if TCPServer === s + case s + when TCPServer ::Revactor::TCP.listen(s, nil) - elsif defined?(::Revactor::UNIX) && UNIXServer === s + when UNIXServer ::Revactor::UNIX.listen(s) - else - logger.error "your version of Revactor can't handle #{s.inspect}" - nil end end - LISTENERS.compact! end end -- cgit v1.2.3-24-ge0c7