multithink 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7bb778470457bc6f85a1a33acd0382bb13ef0b68
-  data.tar.gz: 1489fc8c89e31547d11eaf7705b900d745fde4c5
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTVkZmE4MTA0MTQxMTUzYzQ1YmQ0ZDFjMWYxZTZkYjU2OWM5Njc5MQ==
+  data.tar.gz: !binary |-
+    ZDFjY2U1NzlhMTdiYjZiMjQxYmU1ZDI3YjM4ZGQzMTE2MDMzZGJmMA==
 SHA512:
-  metadata.gz: d914ef40c36e8db39b141e05755e61dfc40363a01163c7ad623fc6cf1d257b3184e3f746d5c6da0fc0231ceaaba3e1f7dbbdc787e975f09c7c0d0e839853ef8e
-  data.tar.gz: 456b9e967f28a1d889a481f7db6425e1d1bf3dcdffa414c6bf85521a9abf91489edb97dde20d3ee611b2198dd8c5ae09d3b651e3b95d36e445fe0fa0020ba10a
+  metadata.gz: !binary |-
+    OTAyNGRiZGVjNDA5YWNiY2U3NTZhN2ExYTg1Mzg0N2EyNWNlNjYxYTIzNmE2
+    Yzk4ZDIwZTQ4MThhMWFhOTFkZGNhYjIwNjA0ZTJlOWY0MDA3YmQ2MzI0NGNl
+    NGNjYWM3MmUxOGIyOGJjMjEyYjIwNzRhNTM2NTY3NWY2M2QwMjQ=
+  data.tar.gz: !binary |-
+    OWJkNmY0NTA2NDYxNmU4MDMyNGM0MDEwNTRhOGUyZDUyMzg2NTdlMGQ4Nzll
+    MmNjMjE2NTcyNWFkOTRkMWVjZDk4N2JhOTg4OWUzNmQ4NWQ1MGQ1MTMwZGQ3
+    NTNlMTRmMjE4MWUyYWFiOTk5ZTBlMzVhMzVjYTM4NDE2ZDk3MTQ=

data/lib/multithink/connection.rb

@@ -20,6 +20,7 @@ class MultiThink::Connection
     while @tried < @retries do
       @servers.each do |server|
         begin
+          #TODO(jpg) make timeout configurable
           Timeout::timeout(1) do
             @conn = r.connect(server)
           end
@@ -37,15 +38,26 @@ class MultiThink::Connection
   def run(query, *args)
     begin
       query.run(@conn, *args)
-    rescue RethinkDB::RqlRuntimeError => e
-      raise e
-    rescue RuntimeError => e
-      if reconnect
-        retry
+    rescue StandardError => e
+      if is_connection_error(e)
+        retry if reconnect
       end
     end
   end
 
+  def is_connection_error(e)
+    case e
+    when Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::EPIPE,
+      Errno::ECONNRESET, Errno::ETIMEDOUT, IOError
+      true
+    when RethinkDB::RqlRuntimeError
+      e.message =~ /cannot perform (read|write): No master available/ ||
+      e.message =~ /Error: Connection Closed/
+    else
+      false
+    end
+  end
+
   def reconnect
     begin
       # try fast path first

data/lib/multithink/version.rb

@@ -1,3 +1,3 @@
 class MultiThink
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: multithink
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Joseph Glanville
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rethinkdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple RethinkDB connection pool.
@@ -79,18 +79,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Simple RethinkDB connection pool.
 test_files: []
+has_rdoc: