AdoccaMemcache 0.1.6 → 0.1.7

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'hoe'
 require './lib/adocca_memcache.rb'
 
-Hoe.new('AdoccaMemcache', '0.1.6') do |p|
+Hoe.new('AdoccaMemcache', '0.1.7') 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

@@ -43,9 +43,13 @@ module Adocca
 
     # Default memcached server weight.
     DEFAULT_WEIGHT = 1
-
-    # Default interval between checking server liveliness
-    VALIDATION_INTERVAL = 30
+    
+    #
+    # The maximum amount of time we are willing to spend
+    # talking to servers before accepting that something
+    # horrible has happened.
+    #
+    LIVELINESS_TIMEOUT = 5
 
     # The amount of time to wait for a response from a memcached server.  If a
     # response is not completed within this time, the connection to the server
@@ -272,8 +276,10 @@ module Adocca
           end
 
           begin
-            sock.write "flush_all\r\n"
-            sock.gets
+            timeout(LIVELINESS_TIMEOUT) do
+              sock.write "flush_all\r\n"
+              sock.gets
+            end
           rescue Exception => err
             server.mark_dead(err.message)
             raise MemCacheError, err.message
@@ -359,10 +365,6 @@ module Adocca
       # connection with a server that is marked dead.
       RETRY_DELAY = 10
 
-      # Default timeout for getting all the necessary info from the server when
-      # checking liveliness
-      LIVELINESS_TIMEOUT = 5
-
       # The host the memcached server is running on.
       attr_reader :host
 
@@ -509,8 +511,10 @@ module Adocca
 
       response = nil
       begin
-        sock.write "#{command}\r\n"
-        [sock.gets, sock, server]
+        timeout(LIVELINESS_TIMEOUT) do
+          sock.write "#{command}\r\n"
+          [sock.gets, sock, server]
+        end
       rescue Exception => err
         server.mark_dead(err.message)
         raise MemCacheError, err.message

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: AdoccaMemcache
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 date: 2007-02-12 00:00:00 +01:00
 summary: A client library to simplify using memcached with Ruby on Rails projects.
 require_paths: