memcache-client 1.7.1 → 1.7.2

data/History.rdoc

@@ -1,4 +1,9 @@
-= 1.7.1
+= 1.7.2 (2009-04-12)
+
+* Rollback socket timeout optimization.  It does not work on all operating systems
+  and was a support headache.
+
+= 1.7.1 (2009-03-28)
 
 * Performance optimizations: 
   * Rely on higher performance operating system socket timeouts for low-level socket 

data/Rakefile

@@ -22,7 +22,7 @@ end
 
 Rake::RDocTask.new do |rd|
 	rd.main = "README.rdoc"
-	rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
+	rd.rdoc_files.include("README.rdoc", "FAQ.rdoc", "History.rdoc", "lib/memcache.rb")
 	rd.rdoc_dir = 'doc'
 end
 

data/lib/memcache.rb

@@ -33,7 +33,7 @@ class MemCache
   ##
   # The version of MemCache you are using.
 
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 
   ##
   # Default options for the cache object.
@@ -1015,30 +1015,30 @@ class MemCache
     end
 
     def connect_to(host, port, timeout=nil)
-      addr = Socket.getaddrinfo(host, nil)
-      sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
-
+      s = TCPSocket.new(host, port, 0)
       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 timeouts don't work for more complex IO operations
-        # like gets which lay on top of read.  We need to fall back to
-        # the standard Timeout mechanism.
-        sock.instance_eval <<-EOR
+        s.instance_eval <<-EOR
           alias :blocking_gets :gets
-          def gets
+          def gets(*args)
+            MemCacheTimer.timeout(#{timeout}) do
+              self.blocking_gets(*args)
+            end
+          end
+          alias :blocking_read :read
+          def read(*args)
+            MemCacheTimer.timeout(#{timeout}) do
+              self.blocking_read(*args)
+            end
+          end
+          alias :blocking_write :write
+          def write(*args)
             MemCacheTimer.timeout(#{timeout}) do
-              self.blocking_gets
+              self.blocking_write(*args)
             end
           end
         EOR
       end
-      sock.connect(Socket.pack_sockaddr_in(port, addr[0][3]))
-      sock
+      s
     end
 
     ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcache-client
 version: !ruby/object:Gem::Version 
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors: 
 - Eric Hodel
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-28 00:00:00 -05:00
+date: 2009-04-12 00:00:00 -05:00
 default_executable: 
 dependencies: []