ar_mysql_flexmaster 0.4.1 → 0.4.2

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.4.1"
+  gem.version       = "0.4.2"
 
   gem.add_runtime_dependency("mysql2")
   gem.add_runtime_dependency("activerecord")

data/lib/active_record/connection_adapters/mysql_flexmaster_adapter.rb

@@ -105,8 +105,8 @@ module ActiveRecord
       def retryable_error?(e)
         case e
         when Mysql2::Error
-          # 2006 is gone-away, 61 is can't-connect (for reconnection: true connections)
-          [2006, 61].include?(e.errno)
+          # 2006 is gone-away, 2003 is can't-connect (applicable when reconnect is true)
+          [2006, 2003].include?(e.errno)
         when ActiveRecord::StatementInvalid
           AR_MESSAGES.any? { |m| e.message.match(m) }
         end
@@ -134,10 +134,11 @@ module ActiveRecord
             @connection = cx if cx
           end
         end
+
         if @rw == :write && !@connection
           # desperation mode: we've been asked for the master, but it's just not available.
           # we'll go ahead and return a connection to the slave, understanding that it'll never work
-          # for writes.
+          # for writes. (we'll call hard_verify and crash)
           @connection = find_correct_host(:read)
         end
       end
@@ -172,14 +173,15 @@ module ActiveRecord
         clear_collected_errors!
 
         sleep_interval = 0.1
-        tries = @tx_hold_timeout.to_f / sleep_interval
+        timeout_at = Time.now.to_f + @tx_hold_timeout
 
-        tries.to_i.times do
+        begin
           @connection = find_correct_host(@rw)
           return if @connection
 
           sleep(sleep_interval)
-        end
+        end while Time.now.to_f < timeout_at
+
         raise_no_server_available!
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_mysql_flexmaster
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -175,3 +175,4 @@ test_files:
 - test/integration/there_and_back_again_test.rb
 - test/integration/with_queries_to_be_killed_test.rb
 - test/integration/wrong_setup_test.rb
+has_rdoc: