Ruby client updated

[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..789ef152ba4dada75fe93ae10f1e86640b48cb14 100644 (file)
--- a/client-libraries/ruby/lib/server.rb
+++ b/client-libraries/ruby/lib/server.rb
@@ -88,12 +88,9 @@ class Server
   end
 
   def connect_to(host, port, timeout=nil)
   end
 
   def connect_to(host, port, timeout=nil)

-    addrs = Socket.getaddrinfo('localhost', nil)
+    addrs = Socket.getaddrinfo(host, nil)

     addr = addrs.detect { |ad| ad[0] == 'AF_INET' }
     sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
     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)
-

     if timeout
       secs = Integer(timeout)
       usecs = Integer((timeout - secs) * 1_000_000)
     if timeout
       secs = Integer(timeout)
       usecs = Integer((timeout - secs) * 1_000_000)


@@ -101,7 +98,7 @@ class Server
       sock.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
       sock.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
     end
       sock.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
       sock.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
     end

-    sock.connect(Socket.pack_sockaddr_in('6379', addr[3]))
+    sock.connect(Socket.pack_sockaddr_in(port, addr[3]))

     sock
   end
 
     sock
   end