AdoccaMemcache 0.1.8 → 0.1.9

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'hoe'
 require './lib/adocca_memcache.rb'
 
-Hoe.new('AdoccaMemcache', '0.1.8') do |p|
+Hoe.new('AdoccaMemcache', '0.1.9') do |p|
   p.rubyforge_name = 'adocca-plugins'
   p.author = 'adocca Entertainment AB'
   p.summary = 'A client library to simplify using memcached with Ruby on Rails projects.'

data/lib/am_memcache.rb

@@ -143,8 +143,8 @@ module Adocca
           v, cache_key, flags, bytes = response.split(/ /)
           rval = sock.read(bytes.to_i)
 
-          sock.gets
-          sock.gets
+          sock.timeout_gets(LIVELINESS_TIMEOUT)
+          sock.timeout_gets(LIVELINESS_TIMEOUT)
         rescue Exception => err
           server.mark_dead(err.message)
           
@@ -251,8 +251,8 @@ module Adocca
           
           v, key, flags, bytes = response.split(/ /)
           value = sock.read(bytes.to_i)
-          sock.gets
-          sock.gets
+          sock.timeout_gets(LIVELINESS_TIMEOUT)
+          sock.timeout_gets(LIVELINESS_TIMEOUT)
         rescue Exception => err
           server.mark_dead(err.message)
           self.class.log_error(err)
@@ -272,10 +272,8 @@ module Adocca
           sock = server.socket
           unless sock.nil?
             begin
-              timeout(LIVELINESS_TIMEOUT) do
-                sock.write "flush_all\r\n"
-                sock.gets
-              end
+              sock.timeout_write("flush_all\r\n", LIVELINESS_TIMEOUT)
+              sock.timeout_gets(LIVELINESS_TIMEOUT)
             rescue Exception => err
               server.mark_dead(err.message)
               self.class.log_error(err)
@@ -410,6 +408,25 @@ module Adocca
         !self.socket.nil?
       end
 
+      module TimeoutSocket
+        class TimeoutError < RuntimeError
+        end
+        def timeout_write(message, timeout)
+          if IO.select(nil, [self], nil, timeout)
+            self.write(message)
+          else
+            raise TimeoutError, "Timeout reached for #{self}.timeout_write(#{message.inspect}, #{timeout})"
+          end
+        end
+        def timeout_gets(timeout)
+          if IO.select([self], nil, nil, timeout)
+            self.gets
+          else
+            raise TimeoutError, "Timeout reached for #{self}.timeout_gets(#{timeout})"
+          end
+        end
+      end
+
       # Try to connect to the memcached server targeted by this object.
       # Returns the connected socket object on success or nil on failure.
       def socket
@@ -423,6 +440,7 @@ module Adocca
               @sock = timeout(CONNECT_TIMEOUT) {
                 TCPSocket::new(@host, @port)
               }
+              @sock.extend(TimeoutSocket)
               @retry  = nil
               @status = "CONNECTED"
             rescue Exception => err
@@ -492,7 +510,7 @@ module Adocca
     def send_command(key, command)
       sock_send_command(key, command)[0]
     end
-    
+
     #
     # Will send a command to the proper server for this key
     # and return the response, socket and server
@@ -510,11 +528,9 @@ module Adocca
           
           response = nil
           
-          timeout(LIVELINESS_TIMEOUT) do
-            sock.write "#{command}\r\n"
-            [sock.gets, sock, server]
-          end
-          
+          sock.timeout_write("#{command}\r\n", LIVELINESS_TIMEOUT)
+          [sock.timeout_gets(LIVELINESS_TIMEOUT), sock, server]
+                    
         rescue Exception => err
           server.mark_dead(err.message) if server
           self.class.log_error(err)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: AdoccaMemcache
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
-date: 2007-02-12 00:00:00 +01:00
+  version: 0.1.9
+date: 2007-02-16 00:00:00 +01:00
 summary: A client library to simplify using memcached with Ruby on Rails projects.
 require_paths: 
 - lib
@@ -59,5 +59,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.4
+        version: 1.2.0
     version: