lib/cachetastic/cache.rb in cachetastic-3.0.3 vs lib/cachetastic/cache.rb in cachetastic-3.0.4

@@ -38,12 +38,14 @@
       # will be returned. This can be used to JIT caches, just make
       # sure in the block to call the set method because the
       # results of the block are not automatically cached.
       def get(key, &block)
         do_with_logging(:get, key) do
-          val = self.adapter.get(key)
-          handle_store_object(key, adapter.unmarshal(val), &block)
+          retryable do
+            val = self.adapter.get(key)
+            handle_store_object(key, adapter.unmarshal(val), &block)
+          end
         end
       end # get
       
       # Set a particular object info the cache for the given key.
       # 
@@ -53,27 +55,33 @@
       # 
       # If there is an the expiry_swing setting is configured it will be +/- to the
       # expiry time.
       def set(key, value, expiry_time = nil)
         do_with_logging(:set, key) do
-          self.adapter.set(key, value, calculate_expiry_time(expiry_time))
+          retryable do
+            self.adapter.set(key, value, calculate_expiry_time(expiry_time))
+          end
         end
       end # set
       
       # Deletes an object from the cache.
       def delete(key)
         do_with_logging(:delete, key) do
-          self.adapter.delete(key)
-          nil
+          retryable do
+            self.adapter.delete(key)
+            nil
+          end
         end
       end # delete
       
       # Expires all objects for this cache.
       def expire_all
         do_with_logging(:expire_all, nil) do
-          self.adapter.expire_all
-          nil
+          retryable do
+            self.adapter.expire_all
+            nil
+          end
         end
       end # expire_all
       
       # Returns the underlying Cachetastic::Adapters::Base for this cache.
       def adapter
@@ -155,9 +163,31 @@
           logger.debug(:finished, action, cache_klass.name, key, (end_time - start_time), str)
           return res
         else
           return yield(key) if block_given?
         end
+      end
+      
+      def retryable(options = {}, &block)
+        opts = { :tries => 2, :on => Exception }.merge(options)
+
+        retries = opts[:tries]
+        retry_exceptions = [opts[:on]].flatten
+
+        x = %{
+          begin
+            return yield
+          rescue #{retry_exceptions.join(", ")} => e
+            retries -= 1
+            if retries > 0
+              retry
+            else
+              raise e
+            end
+          end        
+        }
+
+        eval(x, &block)
       end
       
     end # class << self
     
   end # Cache
\ No newline at end of file