✨ on_error 에 retriable 적용

Author: simon-dunamu

activerecord-mysql-reconnect.gemspec

@@ -21,8 +21,11 @@ Gem::Specification.new do |spec|
   # '~> 4.2.6'
   spec.add_dependency 'activerecord'
   spec.add_dependency 'mysql2'
+  spec.add_dependency 'retriable', '~> 3.1'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency "appraisal"
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'amazing_print'
 end

lib/activerecord-mysql-reconnect.rb

@@ -1,5 +1,6 @@
 require 'active_support'
+require 'retriable'
 
 ActiveSupport.on_load :active_record do
   require_relative 'activerecord/mysql/reconnect'
-end
+end

lib/activerecord/mysql/reconnect/abstract_mysql_adapter_ext.rb

@@ -1,3 +1,5 @@
+require 'retriable'
+
 module Activerecord::Mysql::Reconnect::ExecuteWithReconnect
   def execute(sql, name = nil)
     retryable(sql, name) do |sql_names|
@@ -15,6 +17,8 @@ def execute(sql, name = nil)
 class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
   prepend Activerecord::Mysql::Reconnect::ExecuteWithReconnect
 
+  FAILOVER_RETRY_INTERVALS = [0.2, 0.5, 1.0, 2.0, 3.0, 3.0, 3.0].freeze
+
   private
 
   def retryable(sql, name, &block)
@@ -23,7 +27,9 @@ def retryable(sql, name, &block)
     transaction = current_transaction
 
     if sql =~ /\ABEGIN\z/i and transaction.is_a?(ActiveRecord::ConnectionAdapters::NullTransaction)
-      def transaction.state; nil; end
+      def transaction.state
+        nil;
+      end
     end
 
     Activerecord::Mysql::Reconnect.retryable(
@@ -33,8 +39,10 @@ def transaction.state; nil; end
       :on_error => proc {
         unless block_with_reconnect
           block_with_reconnect = proc do |i|
-            reconnect_without_retry!
-            block.call(i)
+            ::Retriable.retriable(intervals: FAILOVER_RETRY_INTERVALS) do
+              reconnect_without_retry!
+              block.call(i)
+            end
           end
         end
       },