@@ -1061,6 +1061,21 @@ class MemCache io = MemCache::BufferedIO.new(sock) io.read_timeout = timeout + # Getting reports from several customers, including 37signals, + # that the non-blocking timeouts in 1.7.5 don't seem to be reliable. + # It can't hurt to set the underlying socket timeout also, if possible. + if timeout + secs = Integer(timeout) + usecs = Integer((timeout - secs) * 1_000_000) + optval = [secs, usecs].pack("l_2") + begin + io.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval + io.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval + rescue Exception => ex + # Solaris, for one, does not like/support socket timeouts. + @logger.info "[memcache-client] Unable to use raw socket timeouts: #{ex.class.name}: #{ex.message}" if @logger + end + end io end lib/memcache.rb 7df4e8c5c16571a13c7987b7f6dd6156b843725c Mike Perham mperham@gmail.com http://github.com/mperham/memcache-client/commit/74b2599f0c42487fe5d02e9410a271691e2832f2 74b2599f0c42487fe5d02e9410a271691e2832f2 2009-10-29T16:49:00-07:00 2009-10-29T16:49:00-07:00 Add back in raw socket timeout as a backup to the non-blocking IO.select timeout. 730f86baa9ead567de2f7876dc08b54014a17bf9 Mike Perham mperham@gmail.com