minor fix for Solaris boxes

[redis.git] / client-libraries / ruby / lib / server.rb

diff --git a/client-libraries/ruby/lib/server.rb b/client-libraries/ruby/lib/server.rb
index a52fbcbff147f05427e441d69e85e740f9d38839..4fb54937fb1d7cbecb7926e78b9e76de1e95956b 100644 (file)
--- a/client-libraries/ruby/lib/server.rb
+++ b/client-libraries/ruby/lib/server.rb
@@ -1,14 +1,29 @@
+begin
+  # Timeout code is courtesy of Ruby memcache-client
+  #   http://github.com/mperham/memcache-client/tree
+  # Try to use the SystemTimer gem instead of Ruby's timeout library
+  # when running on something that looks like Ruby 1.8.x.  See:
+  #   http://ph7spot.com/articles/system_timer
+  # We don't want to bother trying to load SystemTimer on jruby and
+  # ruby 1.9+.
+  if defined?(JRUBY_VERSION) || (RUBY_VERSION >= '1.9')
+    require 'timeout'
+    RedisTimer = Timeout
+  else
+    require 'system_timer'
+    RedisTimer = SystemTimer
+  end
+rescue LoadError => e
+  puts "[redis-rb] Could not load SystemTimer gem, falling back to Ruby's slower/unsafe timeout library: #{e.message}"
+  require 'timeout'
+  RedisTimer = Timeout
+end
+
 ##
 # This class represents a redis server instance.
 
 class Server
 
-  ##
-  # The amount of time to wait before attempting to re-establish a
-  # connection with a server that is marked dead.
-
-  RETRY_DELAY = 30.0
-
   ##
   # The host the redis server is running on.
 
@@ -19,16 +34,6 @@ class Server
 
   attr_reader :port
   
-  ##
-  #
-  
-  attr_reader :replica
-
-  ##
-  # The time of next retry if the connection is dead.
-
-  attr_reader :retry
-
   ##
   # A text status string describing the state of the server.
 
@@ -38,7 +43,7 @@ class Server
   # Create a new Redis::Server object for the redis instance
   # listening on the given host and port.
 
-  def initialize(host, port = DEFAULT_PORT)
+  def initialize(host, port = DEFAULT_PORT, timeout = 10)
     raise ArgumentError, "No host specified" if host.nil? or host.empty?
     raise ArgumentError, "No port specified" if port.nil? or port.to_i.zero?
 
@@ -46,9 +51,8 @@ class Server
     @port   = port.to_i
 
     @sock   = nil
-    @retry  = nil
     @status = 'NOT CONNECTED'
-    @timeout = 1
+    @timeout = timeout
   end
 
   ##
@@ -62,70 +66,66 @@ class Server
   # Returns the connected socket object on success or nil on failure.
 
   def socket
-    return @sock if @sock and not @sock.closed?
-
-    @sock = nil
-
-    # If the host was dead, don't retry for a while.
-    return if @retry and @retry > Time.now
-
+    return @sock if socket_alive?
+    close
     # Attempt to connect if not already connected.
     begin
       @sock = connect_to(@host, @port, @timeout)
       @sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
-      @retry  = nil
       @status = 'CONNECTED'
     rescue Errno::EPIPE, Errno::ECONNREFUSED => e
-      puts "Socket died... socket: #{@sock.inspect}\n" if $debug
-      @sock.close
+      puts "Socket died... : #{e}\n" if $debug
       retry
     rescue SocketError, SystemCallError, IOError => err
       puts "Unable to open socket: #{err.class.name}, #{err.message}" if $debug
-      mark_dead err
     end
-
-    return @sock
+    @sock
   end
 
   def connect_to(host, port, timeout=nil)
-    addrs = Socket.getaddrinfo('localhost', nil)
-    addr = addrs.detect { |ad| ad[0] == 'AF_INET' }
-    sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-    #addr = Socket.getaddrinfo(host, nil)
-    #sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
-
+    socket = TCPSocket.new(host, port)
+    socket.set_encoding(Encoding::BINARY) if socket.respond_to?(:set_encoding)
     if timeout
-      secs = Integer(timeout)
-      usecs = Integer((timeout - secs) * 1_000_000)
-      optval = [secs, usecs].pack("l_2")
-      sock.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
-      sock.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
+      socket.instance_eval <<-EOR
+        alias :blocking_readline :readline
+        def readline(*args)
+          RedisTimer.timeout(#{timeout}) do
+            self.blocking_readline(*args)
+          end
+        end
+        alias :blocking_read :read
+        def read(*args)
+          RedisTimer.timeout(#{timeout}) do
+            self.blocking_read(*args)
+          end
+        end
+        alias :blocking_write :write
+        def write(*args)
+          RedisTimer.timeout(#{timeout}) do
+            self.blocking_write(*args)
+          end
+        end
+      EOR
     end
-    sock.connect(Socket.pack_sockaddr_in('6379', addr[3]))
-    sock
+    socket
   end
 
-  ##
   # Close the connection to the redis server targeted by this
-  # object.  The server is not considered dead.
+  # object. 
 
   def close
-    @sock.close if @sock && !@sock.closed?
+    @sock.close if !@sock.nil? && !@sock.closed?
     @sock   = nil
-    @retry  = nil
     @status = "NOT CONNECTED"
   end
 
-  ##
-  # Mark the server as dead and close its socket.
-  def mark_dead(error)
-    @sock.close if @sock && !@sock.closed?
-    @sock   = nil
-    @retry  = Time.now #+ RETRY_DELAY
-
-    reason = "#{error.class.name}: #{error.message}"
-    @status = sprintf "%s:%s DEAD (%s), will retry at %s", @host, @port, reason, @retry
-    puts @status
-  end
-
+  private
+    def socket_alive?
+      #BTM - TODO - FileStat is borked under JRuby
+      unless defined?(JRUBY_VERSION)
+        !@sock.nil? &&  !@sock.closed? && @sock.stat.readable?
+      else 
+        !@sock.nil? &&  !@sock.closed?
+      end
+    end
 end