slave_pools 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0fd6bf772d8b4651a9c582e9e04c079d7fdc788
-  data.tar.gz: 61e8af6660ecb8de50e5160dfba7a90ee3162935
+  metadata.gz: 1af19658e56521d10ebddd67a970dd7432b92e0e
+  data.tar.gz: f6c72622c728ad4857350beeaf39ce66c6e69fb4
 SHA512:
-  metadata.gz: b1063bfd67d77804819728d33e1c13d11daa65c295e1647ee7a2af4acdf115810ec777545964c085feb4b6c86cae78312699c2ff7a11621d37f766eac3407389
-  data.tar.gz: bf754bf16417db1effd756db76bd536a745eb82e6275bb842926888a5f8b2f2e945e55d7db37d12f94a5f1576fe849d0856d09fac1a8836ed59901bfade12626
+  metadata.gz: 991f5fccf93d7534694dab0f70ce6f13c4bc884f63031941940c110f46448f1d520908d0f4bbb5a9df65d340061403d77f2a00e8b2c82d29acfe01e935580ce2
+  data.tar.gz: bc84b2d325527d50589cf92eddfc31ee4e5009cfefffe4a8efa75b607e7a590bbb511808bdac7fcb9ad4c6e8163e7cb4bdefef97a14e1aa61d9d799eac5a5300

data/lib/slave_pools/engine.rb

@@ -21,9 +21,11 @@ module SlavePools
         else
           warn "Unsupported ActiveRecord version #{ActiveRecord.version}. Please whitelist the safe methods."
         end
-      SlavePools.config.no_replay_on_master = {
-        'Mysql2::Error' => ['Timeout waiting for a response from the last query']
-      }
+      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.0"
+  VERSION = "1.1.1"
 end

metadata

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