util: small ivar reduction

1 files changed, 5 insertions, 9 deletions

diff --git a/lib/mogilefs/util.rb b/lib/mogilefs/util.rb
index d621cc1..bca502a 100644
--- a/lib/mogilefs/util.rb
+++ b/lib/mogilefs/util.rb
@@ -111,20 +111,16 @@ require 'timeout'
 class MogileFS::Timeout < Timeout::Error; end
 
 class Socket
-  attr_accessor :mogilefs_addr, :mogilefs_connected, :mogilefs_size
+  attr_accessor :mogilefs_size
 
   def mogilefs_init(host = nil, port = nil)
-    return true if defined?(@mogilefs_connected)
-
-    @mogilefs_addr = Socket.sockaddr_in(port, host).freeze if port && host
+    mogilefs_addr = Socket.sockaddr_in(port, host)
 
     begin
-      connect_nonblock(@mogilefs_addr)
-      @mogilefs_connected = true
+      connect_nonblock(mogilefs_addr)
     rescue Errno::EINPROGRESS
-      nil
     rescue Errno::EISCONN
-      @mogilefs_connected = true
+      true
     end
   end
 
@@ -150,7 +146,7 @@ class Socket
       while timeout > 0
         t0 = Time.now
         r = IO.select(nil, [sock], nil, timeout)
-        return sock if r && r[1] && sock.mogilefs_init
+        return sock if r && r[1] && sock.mogilefs_init(host, port)
         timeout -= (Time.now - t0)
       end