mongo_ha 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81ceebba66286ee047edc336a2002178c3f4be2c020249b3fa1735329c88b72f
-  data.tar.gz: 9917438968b6fc4289bf496352a6ea4ac4f20fc05fe7a815b21f9365fd29f92d
+  metadata.gz: eaf8486b5f343d3ef3a04eaf534c2e27d4a1fc392c257a2fc3345b07d1e07358
+  data.tar.gz: 464f54bc8ff8c19618aad18c9e5d6613429b1aec7f2e47ff58d503b97eeef99d
 SHA512:
-  metadata.gz: 5d3cef755e934e7b3b9e61155fbd38273f0a754f0c83ba1f2b741fc8e34a386ed703ea5fbbef0390a3b2deff3dc7ac46f5ec6eb0a9c91aaa999003213093ea4b
-  data.tar.gz: 8bbb7915a3bfcea4513e1c7d04f92f8d9a15a4bd2b1f1065e2875c81a0cc5a0cf8bd9f37eb514d0c254af20a4c9cda9c3a18ec3f8c7290ba8c90a4679e027fba
+  metadata.gz: a7f48ad7a201e8819d2386e37e012b9a56ff0ad4dde1fb968f8d77598de22273882717084091d8994d7ba93483c3e59f9f9be58e2addd6733d76223ba26594d9
+  data.tar.gz: 84d886c29f741f79bb9680048d918ee1ee50ebcab3a0b3dad586cc152eeb49ba653a48fd0a52cbdf7920f8cdd617b2eb7dcba1aa7a0a42d1df360c42c89d2cf7

data/lib/mongo_ha/retryable.rb

@@ -2,42 +2,28 @@ require 'mongo/retryable'
 
 module Mongo
   module Retryable
-
-    def read_with_retry
+    def legacy_write_with_retry(server = nil)
       attempt = 0
       begin
         attempt += 1
-        yield
+        yield(server || cluster.next_primary)
       rescue Error::SocketError, Error::SocketTimeoutError => e
+        server = nil
         raise(e) if attempt > cluster.max_read_retries
         log_retry(e)
         cluster.scan!
         retry
       rescue Error::OperationFailure => e
-        raise(e) if !e.retryable? || (attempt > cluster.max_read_retries)
-        log_retry(e)
-        cluster.sharded? ? sleep(cluster.read_retry_interval) : cluster.scan!
-        retry
-      end
-    end
-
-    def write_with_retry(session, server_selector)
-      attempt = 0
-      begin
-        attempt += 1
-        yield(server_selector.call)
-      rescue Error::SocketError, Error::SocketTimeoutError => e
+        server = nil
         raise(e) if attempt > cluster.max_read_retries
-        log_retry(e)
-        cluster.scan!
-        retry
-      rescue Error::OperationFailure => e
-        raise(e) if !e.write_retryable? || (attempt > cluster.max_read_retries)
-        log_retry(e)
-        cluster.scan!
-        retry
+        if e.write_retryable?
+          log_retry(e)
+          cluster.scan!
+          retry
+        else
+          raise(e)
+        end
       end
     end
-
   end
 end

data/lib/mongo_ha/version.rb

@@ -1,3 +1,3 @@
-module MongoHA #:nodoc
-  VERSION = '2.5.0'
+module MongoHA
+  VERSION = '2.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo_ha
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.1
 description: Automatic reconnects and recovery when replica-set changes, or connections
   are lost, with transparent recovery
 email:
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: High availability for the mongo ruby driver