slave_pools 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1af19658e56521d10ebddd67a970dd7432b92e0e
-  data.tar.gz: f6c72622c728ad4857350beeaf39ce66c6e69fb4
+  metadata.gz: 50f5e7c113601d6c4102dd8660462ae9a1f62330
+  data.tar.gz: f0af5c9ca9d4c7bf04e93688d6090374389ff091
 SHA512:
-  metadata.gz: 991f5fccf93d7534694dab0f70ce6f13c4bc884f63031941940c110f46448f1d520908d0f4bbb5a9df65d340061403d77f2a00e8b2c82d29acfe01e935580ce2
-  data.tar.gz: bc84b2d325527d50589cf92eddfc31ee4e5009cfefffe4a8efa75b607e7a590bbb511808bdac7fcb9ad4c6e8163e7cb4bdefef97a14e1aa61d9d799eac5a5300
+  metadata.gz: d51b2c0210454fbf3188f7c95ae46556846676bb3d5453ba46a29eef8f374ec75a3c1e16fdbff13f117e22fa953001e9a2db9a1587456008ab9e9fbe376c37a6
+  data.tar.gz: db186e0357c7221d768a285e39d666bc3139e15170d9b6b14f78399ab35e8baa657268f751a7faaceb5808347d70019a10c56d85c9faa739743332ed79007a63

data/README.md

@@ -88,17 +88,6 @@ Add a `config/initializers/slave_pools.rb` if you want to change config settings
 
     SlavePools.config.defaults_to_master = true
 
-#### Configure Errors to not replay on master
-
-Some errors you may not want to replay on master, e.g. queries that timeout.
-
-This can be configured by updating the no_replay_on_master with a hash of errors and the corresponding messages that should not be replayed, e.g.:
-
-    SlavePools.config.no_replay_on_master = {
-      'Mysql2::Error' => ['Timeout waiting for a response from the last query', 'other error message that you don't want to replay'],
-      'TimeoutError' => ['some message']
-    }
-
 ## Usage
 
 Toggle to next replica:

data/lib/slave_pools/config.rb

@@ -13,16 +13,10 @@ module SlavePools
     # Defaults are based on Rails version.
     attr_accessor :safe_methods
 
-    # enter a list of errors/messages that shouldn't fall back to master
-    # of the form {'ErrorClass' => ['message regex1', 'message regex 2'], }
-    # Defaults are {'Mysql2::Error' => ['Timeout waiting for a response from the last query']}.
-    attr_accessor :no_replay_on_master
-
     def initialize
       @environment        = 'development'
       @defaults_to_master = false
       @safe_methods       = []
-      @no_replay_on_master = {}
     end
   end
 end

data/lib/slave_pools/connection_proxy.rb

@@ -108,27 +108,9 @@ module SlavePools
     rescue => e
       SlavePools.log :error, "Error during ##{method}: #{e}"
       log_proxy_state
-      raise if conn == master
 
-      if safe_to_replay(e)
-        SlavePools.log :error, %(#{e.message}\n#{e.backtrace.join("\n")})
-        SlavePools.log :error, "Replaying on master."
-        route_to(master, method, *args, &block)
-      else
-        current.retrieve_connection.verify! # may reconnect
-        raise e
-      end
-    end
-
-    # decides whether to replay query against master based on the
-    # exception and message.
-    # These can be adjusted by setting SlavePools.configs.no_replay_on_master.
-    def safe_to_replay(e)
-      return true unless flagged_messages_for_error = SlavePools.config.no_replay_on_master[e.class.to_s]
-
-      return false if flagged_messages_for_error.any? {|m| e.message.match(m)}
-
-      true
+      current.retrieve_connection.verify! # may reconnect
+      raise e
     end
 
     private

data/lib/slave_pools/engine.rb

@@ -21,11 +21,6 @@ module SlavePools
         else
           warn "Unsupported ActiveRecord version #{ActiveRecord.version}. Please whitelist the safe methods."
         end
-      if SlavePools.config.no_replay_on_master.blank?
-        SlavePools.config.no_replay_on_master = {
-          'Mysql2::Error' => ['Timeout waiting for a response from the last query']
-        }
-      end
     end
 
     config.after_initialize do

data/lib/slave_pools/version.rb

@@ -1,3 +1,3 @@
 module SlavePools
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/connection_proxy_spec.rb

@@ -143,16 +143,7 @@ describe SlavePools do
     @proxy.should respond_to(:unsafe)
   end
 
-  it 'should rescue an error not flagged as no replay' do
-    SlavePools.config.no_replay_on_master = {'Mysql2::Error' => ['random message']}
-    @default_slave1.should_receive(:select_all).once.and_raise(Mysql2::Error.new('Timeout waiting for a response'))
-    @default_slave2.should_not_receive(:select_all)
-    @master.should_receive(:select_all).and_return(true)
-    lambda { @proxy.select_all(@sql) }.should_not raise_error
-  end
-
-  it 'should re-raise a Error that is flagged as no replay' do
-    SlavePools.config.no_replay_on_master = {'ArgumentError' => ['random message']}
+  it 'should not replay errors on master' do
     @default_slave1.should_receive(:select_all).once.and_raise(ArgumentError.new('random message'))
     @default_slave2.should_not_receive(:select_all)
     @master.should_not_receive(:select_all)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slave_pools
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Dan Drabik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord