switchman 1.12.11 → 1.12.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4812ac6ce707debd4e3f051bb5a252423f3151f8bd01132be6bf8d70b88d5d2f
-  data.tar.gz: 193b31d26be336ba9441e6f4cd3702a57652ff6fc78454050aeee8c46795837c
+  metadata.gz: 809ad5808c045d1b4f9b2e7ac5084b0d10ced204c76d85b6649ec8a55384dd04
+  data.tar.gz: bba8310639966bc33a47ada04d46628a15ddf7a531e92c9ff9cecd9e1050a338
 SHA512:
-  metadata.gz: 0ab5d97b97144a52ead634b53a17e60514eb653f82634b9a86b48676a13591b2511fc55f132d30634bf3abf42e3ccff17fe5ec96a27b61f5046a3fa22adc39a9
-  data.tar.gz: 18e0c13e3b678c0007df134d6ed18404ba11f669b077ff1fdf912a9799a75db578c4605088f0e0c399840c65e56bf7b1e17aaae807c8b6a9403b96f68f537ca1
+  metadata.gz: 6ccf69f1a56258e1bd8b1c1dd915f50bb2b7fbff026168a08aadb5a71d7ede117bdebfaff48ea0ecd870295d0be810e1f425dd864dbd0ca2532c882b241d8973
+  data.tar.gz: 8b12e4e22e15e7cfbbc9e635f4b9d6c035ccc20d21afdbc347b9f1ddc6c906dc507362c936cb2de65a52f00de8d6bc96ae7d6e64f1ed5e9f5600a49ac42fc0a6

data/app/models/switchman/shard_internal.rb

@@ -28,6 +28,8 @@ module Switchman
     after_save :clear_cache
     after_destroy :clear_cache
 
+    after_rollback :on_rollback
+
     scope :primary, -> { where(name: nil).order(:database_server_id, :id).distinct_on(:database_server_id) }
 
     class << self
@@ -676,6 +678,18 @@ module Switchman
       database_server.shard_name(self)
     end
 
+    def on_rollback
+      # make sure all connection pool proxies are referencing valid pools
+      ::ActiveRecord::Base.connection_handler.connection_pools.each do |pool|
+        next unless pool.is_a?(ConnectionPoolProxy)
+        ::Shackles.activated_environments.each do |env|
+          ::Shackles.activate(env) do
+            pool.current_pool
+          end
+        end
+      end
+    end
+
     def hashify_categories(categories)
       if categories.empty?
         { :primary => self }

data/lib/switchman/active_record/connection_pool.rb

@@ -4,11 +4,11 @@ module Switchman
   module ActiveRecord
     module ConnectionPool
       def shard
-        Thread.current["#{object_id}_shard".to_sym] || Shard.default
+        Thread.current[tls_key] || Shard.default
       end
 
       def shard=(value)
-        Thread.current["#{object_id}_shard".to_sym] = value
+        Thread.current[tls_key] = value
       end
 
       def default_schema
@@ -84,6 +84,12 @@ module Switchman
         end
         conn.shard = shard
       end
+
+      private
+
+      def tls_key
+        "#{object_id}_shard".to_sym
+      end
     end
   end
 end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.12.11"
+  VERSION = "1.12.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.12.11
+  version: 1.12.12
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic