redis_ha 0.0.1 → 0.0.2

data/lib/redis_ha/connection.rb

@@ -64,12 +64,14 @@ private
     ret = Timeout::timeout(@read_timeout) do
       yield
     end
-  rescue Redis::CannotConnectError
-    mark_as_down; nil
-  rescue Timeout::Error
-    mark_as_down; nil
+  rescue Exception => e
+    @status = :down
+    @down_since = Time.now.to_f
+    return nil
   else
-    mark_as_up; ret
+    @down_since = nil if @status != :up
+    @status = :up
+    return ret
   end
 
   def up_or_retry?
@@ -81,16 +83,5 @@ private
     false
   end
 
-  def mark_as_down
-    @status = :down
-    @down_since = Time.now.to_f
-  end
-
-  def mark_as_up
-    return if @status == :up
-    @status = :up
-    @down_since = nil
-  end
-
 end
 

data/redis_ha.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "redis_ha"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.date        = Date.today.to_s
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Paul Asmuth"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_ha
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &19924060 !ruby/object:Gem::Requirement
+  requirement: &14862340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *19924060
+  version_requirements: *14862340
 description: Three basic CRDTs (set, hashmap and counter) for redis. Also includes
   a ConnectionPool that allows you to run concurrent redis commands on multiple connections
   w/o using eventmachine/em-hiredis.