AdoccaMemcache 0.1.5 → 0.1.6

data/Rakefile

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

@@ -2,6 +2,7 @@ require 'socket'
 require 'thread'
 require 'digest/sha1'
 require 'timeout'
+require 'monitor'
 
 module Adocca
   
@@ -72,28 +73,6 @@ module Adocca
       end
       @servers   = []
       @buckets   = []
-      start_validation
-    end
-
-    def start_validation
-      Thread.new do
-        loop do
-          begin
-            @servers.each do |server|
-              server.check_liveliness if server.alive?
-            end
-            sleep VALIDATION_INTERVAL
-          rescue Exception => e
-            if defined?(RAILS_DEFAULT_LOGGER)
-              RAILS_DEFAULT_LOGGER.error("validation got #{e}")
-              RAILS_DEFAULT_LOGGER.error(PP.pp(e.backtrace, ""))
-            else
-              puts e
-              pp e.backtrace
-            end
-          end
-        end
-      end
     end
 
     # Return a string representation of the cache object.
@@ -153,8 +132,10 @@ module Adocca
 
           sock.gets
           sock.gets
-        rescue SystemCallError, IOError => err
-          server.mark_dead
+        rescue MemCacheError => e
+          raise e
+        rescue Exception => err
+          server.mark_dead(err.message)
           raise MemCacheError, err.message
         end
       end
@@ -270,8 +251,8 @@ module Adocca
           value = sock.read(bytes.to_i)
           sock.gets
           sock.gets
-        rescue SystemCallError, IOError => err
-          server.mark_dead
+        rescue Exception => err
+          server.mark_dead(err.message)
           raise MemCacheError, err.message
         end
         
@@ -293,8 +274,8 @@ module Adocca
           begin
             sock.write "flush_all\r\n"
             sock.gets
-          rescue SystemCallError, IOError => err
-            server.mark_dead
+          rescue Exception => err
+            server.mark_dead(err.message)
             raise MemCacheError, err.message
           end
         end
@@ -368,6 +349,7 @@ module Adocca
 
     # This class represents a memcached server instance.
     class Server
+      extend Forwardable
       # The amount of time to wait to establish a connection with a
       # memcached server.  If a connection cannot be established within
       # this time limit, the server will be marked as down.
@@ -415,34 +397,6 @@ module Adocca
         @status = "NOT CONNECTED"
       end
 
-      #
-      # Will make sure the server works and mark_dead if not.
-      #
-      def check_liveliness
-        key = rand(1 << 32).to_s
-        value = rand(1 << 32).to_s
-        begin
-          timeout(LIVELINESS_TIMEOUT) do
-            socket.write("set am_memcache_check_liveliness_#{key} 0 #{LIVELINESS_TIMEOUT * 2} #{value.size}\r\n" + value + "\r\n")
-            raise 'bad response to set' unless @sock.gets == "STORED\r\n"
-            socket.write("get am_memcache_check_liveliness_#{key}\r\n")
-            v, cache_key, flags, bytes = @sock.gets.split(/ /)
-            raise 'bad response to get' unless @sock.read(bytes.to_i) == value
-            socket.gets
-            socket.gets
-          end
-        rescue Exception => e
-          mark_dead
-          if defined?(RAILS_DEFAULT_LOGGER)
-            RAILS_DEFAULT_LOGGER.error("liveliness check got #{e}")
-            RAILS_DEFAULT_LOGGER.error(PP.pp(e.backtrace, ""))
-          else
-            puts e
-            pp e.backtrace
-          end
-        end
-      end
-
       # Return a string representation of the server object.
       def inspect
         sprintf("<MemCache::Server: %s:%d [%d] (%s)>",
@@ -472,7 +426,7 @@ module Adocca
               }
               @retry  = nil
               @status = "CONNECTED"
-            rescue SystemCallError, IOError, Timeout::Error => err
+            rescue Exception => err
               self.mark_dead(err.message)
             end
           end
@@ -505,7 +459,7 @@ module Adocca
     ###########################################################################
 
     # Base MemCache exception class.
-    class MemCacheError < ::Exception
+    class MemCacheError < ::RuntimeError
     end
 
     # MemCache internal error class.  Instances of this class mean that there
@@ -557,8 +511,8 @@ module Adocca
       begin
         sock.write "#{command}\r\n"
         [sock.gets, sock, server]
-      rescue SystemCallError, IOError => err
-        server.mark_dead
+      rescue Exception => err
+        server.mark_dead(err.message)
         raise MemCacheError, err.message
       end
     end

metadata

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