activerecord-mysql-reconnect 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22681715c79fdec28b4dcffd8a5f1e73a9c45f71
-  data.tar.gz: 977d88bd69f012e89270b17730da3312031966eb
+  metadata.gz: 1b2336f22ee2714c4d2d6d87ddd61d5487b15c40
+  data.tar.gz: d6f2eeb31a54a091eba165db2c0e8586c9452902
 SHA512:
-  metadata.gz: febba5eaf59e2e0704c1b5dbaf47d4b5ab43eafd93de02eaafb6d5bec8edb1b805666cff5524c70851d6905bdfc2bafb0d9598e0c9a9bf3233f2a50bd4e56145
-  data.tar.gz: 104afd1d2871e16ce7885aa9b236af13906a40bd7b833737d7d24c37731d844b7df9b06ff2773683e0c78841cece01e8e907d5300444f7f9cc3fe3906c88b355
+  metadata.gz: dd60c8b113f3c3bfe4f5244deb1c51ddca613b356400f15bee03dbbc1f4c4f08a9e817b2a8773a5d0b0e01be8ac80272adea31697e533ed8373819ba2ccd0a44
+  data.tar.gz: a4b643b0554b0ee64c51c5e04288ce41033800a38f7bcd9ed020b1b16706a15be673c03fc98cb2a7e1d9b2d6a5c6fe397408789e1915b12d2139549b4e64be38

data/README.md

@@ -34,6 +34,7 @@ ActiveRecord::Base.establish_connection(
 
 ActiveRecord::Base.logger = Logger.new($stdout)
 ActiveRecord::Base.logger.formatter = proc {|_, _, _, message| "#{message}\n" }
+ActiveRecord::Base.enable_retry = true
 ActiveRecord::Base.execution_tries = 3
 
 class Employee < ActiveRecord::Base; end
@@ -87,6 +88,7 @@ gem 'activerecord-mysql-reconnect'
 ```ruby
 MyApp::Application.configure do
   ...
+  config.active_record.enable_retry = true
   config.active_record.execution_tries = 10 # times
   config.active_record.execution_retry_wait = 1.5 # sec
   ...

data/lib/activerecord/mysql/reconnect/base_ext.rb

@@ -1,6 +1,7 @@
 class ActiveRecord::Base
   class_attribute :execution_tries, :instance_writer => false
   class_attribute :execution_retry_wait, :instance_writer => false
+  class_attribute :enable_retry, :instance_writer => false
 
   class << self
     def without_retry

data/lib/activerecord/mysql/reconnect/version.rb

@@ -1,7 +1,7 @@
 module Activerecord
   module Mysql
     module Reconnect
-      VERSION = '0.2.0'
+      VERSION = '0.2.1'
     end
   end
 end

data/lib/activerecord/mysql/reconnect.rb

@@ -47,6 +47,10 @@ module Activerecord::Mysql::Reconnect
       ActiveRecord::Base.execution_retry_wait || DEFAULT_EXECUTION_RETRY_WAIT
     end
 
+    def enable_retry
+      !!ActiveRecord::Base.enable_retry
+    end
+
     def retryable(opts)
       block = opts.fetch(:proc)
       on_error = opts[:on_error]
@@ -58,7 +62,7 @@ module Activerecord::Mysql::Reconnect
           retval = block.call
           break
         rescue => e
-          if (tries.zero? or n < tries) and should_handle?(e)
+          if enable_retry and (tries.zero? or n < tries) and should_handle?(e)
             on_error.call if on_error
             wait = self.execution_retry_wait * n
             logger.warn("MySQL server has gone away. Trying to reconnect in #{wait} seconds. (cause: #{e} [#{e.class}])")

data/spec/activerecord-mysql-reconnect_spec.rb

@@ -213,4 +213,23 @@ describe 'activerecord-mysql-reconnect' do
       th.join
     }.to_not raise_error
   end
+
+  it 'disable reconnect' do
+    expect {
+      begin
+        ActiveRecord::Base.enable_retry = false
+        expect(Employee.all.length).to eq(300024)
+        mysql_restart
+        expect(Employee.all.length).to eq(300024)
+      ensure
+        ActiveRecord::Base.enable_retry = true
+      end
+    }.to raise_error(ActiveRecord::StatementInvalid)
+
+    expect {
+      expect(Employee.all.length).to eq(300024)
+      mysql_restart
+      expect(Employee.all.length).to eq(300024)
+    }.to_not raise_error
+  end
 end

data/spec/spec_helper.rb

@@ -36,6 +36,7 @@ RSpec.configure do |config|
 
     ActiveRecord::Base.logger = Logger.new($stdout)
     ActiveRecord::Base.logger.formatter = proc {|_, _, _, message| "#{message}\n" }
+    ActiveRecord::Base.enable_retry = true
     ActiveRecord::Base.execution_tries = 10
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-reconnect
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord