ar_mysql_flexmaster 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dffa59e91370055f41c5d4e7d6f6d2d0995251a6
-  data.tar.gz: afcf28a678aa561fcf57d9cbe1fd63038e3385ae
+  metadata.gz: 8d979b832a9129feb067d6993efc2ac5fc58ae92
+  data.tar.gz: 600daab5842bf3edebc12e17ede751032b3c3c53
 SHA512:
-  metadata.gz: 8123f48cb4a821997e488027544405776fb2dfc3aff20ae99b2f5018ea70f02e079a71f4b6328c2dc5351e9f1bd3715e1ec6694cf14ed65f2af3d456bb685086
-  data.tar.gz: f45fe4dbb857085b4bd5d0adbfdd778b52a625b22669def9812561505b08d6f64f7ee6d50cb06f65860689da7c58d6c9537aa1d50cc30c94021d0c0d2eb1f474
+  metadata.gz: 20975216d3400b8755321d8e9de0f506e3a661de0e698fb9e89f54ec647017700c9596b3f341a0acd7b059d4721d10b129b4af3439b5c9ff3eece408f6ea153b
+  data.tar.gz: eedcce97ab154e6b2886fd51cf8cda509b3e77b382ccd84df9333e66805ed3b4a2da79ed2d274f9f1c880fbf69700fbec842719d34eaa749fd19f4d3f8e7c211

data/ar_mysql_flexmaster.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "ar_mysql_flexmaster"
   gem.require_paths = ["lib"]
-  gem.version       = "0.5.0"
+  gem.version       = "0.6.0"
 
   gem.add_runtime_dependency("mysql2")
   gem.add_runtime_dependency("activerecord")

data/lib/active_record/connection_adapters/mysql_flexmaster_adapter.rb

@@ -28,16 +28,18 @@ module ActiveRecord
       class TooManyMastersException < StandardError; end
       class NoServerAvailableException < StandardError; end
 
-      CHECK_EVERY_N_SELECTS = 10
-      DEFAULT_CONNECT_TIMEOUT = 5
-      DEFAULT_TX_HOLD_TIMEOUT = 5
+      CHECK_EVERY_N_SELECTS    = 10
+      DEFAULT_CONNECT_TIMEOUT  = 1
+      DEFAULT_CONNECT_ATTEMPTS = 3
+      DEFAULT_TX_HOLD_TIMEOUT  = 5
 
       def initialize(logger, config)
         @select_counter = 0
         @config = config
         @rw = config[:slave] ? :read : :write
-        @tx_hold_timeout = @config[:tx_hold_timeout] || DEFAULT_TX_HOLD_TIMEOUT
-        @connection_timeout = @config[:connection_timeout] || DEFAULT_CONNECT_TIMEOUT
+        @tx_hold_timeout     = @config[:tx_hold_timeout]     || DEFAULT_TX_HOLD_TIMEOUT
+        @connection_timeout  = @config[:connection_timeout]  || DEFAULT_CONNECT_TIMEOUT
+        @connection_attempts = @config[:connection_attempts] || DEFAULT_CONNECT_ATTEMPTS
 
         connection = find_correct_host(@rw)
 
@@ -245,6 +247,7 @@ module ActiveRecord
       end
 
       def initialize_connection(host, port)
+        attempts = 1
         begin
           Timeout::timeout(@connection_timeout) do
             cfg = @config.merge(:host => host, :port => port)
@@ -252,12 +255,14 @@ module ActiveRecord
               cx.query_options.merge!(:as => :array)
             end
           end
-        rescue Mysql2::Error => e
-          collected_errors << e
-          nil
-        rescue Timeout::Error => e
-          collected_errors << e
-          nil
+        rescue Mysql2::Error, Timeout::Error => e
+          if attempts < @connection_attempts
+            attempts += 1
+            retry
+          else
+            collected_errors << e
+            nil
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_mysql_flexmaster
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2