switchman 1.2.11 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24a9d501ff39800e2fbc3c7bcdd58b1ed78a59fc
-  data.tar.gz: bd0d9bb1b19dc0ea14b5f79f44a16925283e761a
+  metadata.gz: c2e8747b77d09d38c1f00f984c7e85d6560515b3
+  data.tar.gz: d9bfe61f3a1a7a0a22a1cb5cbffa33ef751b3b7e
 SHA512:
-  metadata.gz: bd6f9f98050e479013de4f449d9c1f77fe2a851c3bcec9b40701d52c6b2457e4bc3a36df12a97c1e7f9fd2f5597df11ef360233cf7403fe1aa3e6a70b7c77477
-  data.tar.gz: e4df60dc747f88ea8908395d01685d4a9b7a43417e4d8c915d2ae38f94b5a88a465d4ab741d242c67f0fd33778aec11cf8d698eab6dfd2c67513e95d5296f9b0
+  metadata.gz: 05bf84c6e45ed9530202a4f5ce6ba058326cbd7fae15c8ab3d8c4c5d50328d93df41e9027e61b4591856d2452537f82b96de589460a8ac4e43d8916a0cb9d2fc
+  data.tar.gz: 6bcab454b76a9c373708222463414959c4a14c08946d94c1aa7c1d4a9d8e72f5027ae1fdc7ea86fad20b15f3bdf0f35e7cf5266023d97c82516ec03600b6c381

data/lib/switchman/active_record/connection_pool.rb

@@ -24,9 +24,6 @@ module Switchman
       def checkout_new_connection_with_sharding
         # TODO: this might be a threading issue
         spec.config[:shard_name] = self.shard.name
-        if self.shard.database_server.id == ::Rails.env
-          ::ActiveRecord::Base.configurations[::Rails.env] = spec.config.stringify_keys
-        end
 
         conn = checkout_new_connection_without_sharding
         conn.shard = self.shard

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.2.11"
+  VERSION = "1.2.12"
 end

data/lib/tasks/switchman.rake

@@ -64,6 +64,8 @@ module Switchman
         Shard.with_each_shard(shards, Shard.categories, :parallel => ENV['PARALLEL'].to_i) do
           shard = Shard.current
           puts "#{shard.id}: #{shard.description}"
+          ::ActiveRecord::Base.connection_pool.spec.config[:shard_name] = Shard.current.name
+          ::ActiveRecord::Base.configurations[::Rails.env] = ::ActiveRecord::Base.connection_pool.spec.config.stringify_keys
           shard.database_server.unshackle do
             old_actions.each(&:call)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties