culturecode_stagehand 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 778925f3540847fcf089ab3ffb65d6993362c59e
-  data.tar.gz: 770602a0719fef798f82744b00e9c60dc33f6c24
+  metadata.gz: 3dab896a9f7c3dc73684d932a38b73dd622078d8
+  data.tar.gz: 5c6ed76e33a075d8fad38b75270c4d07302b4356
 SHA512:
-  metadata.gz: fd85561ed53df15f0180ef0a42eaa17f01e6c904e6208aec47b87b9ba3fdd661285c1bb88e8d6d16916df38247ff399d9d8e371b34761526bd877ce724d65b22
-  data.tar.gz: 1e0a9fe56efcf5fe0a65183cbc3d798c629c814d6be31bf3aa4fa637821fbe4e8d9c037c1fa302372da03910f61d8066afd1dce047e218b1be059ced4afc7486
+  metadata.gz: 952176cc2d5c7a0a62651071afc0f8c290c94787dc744b3390a8264b74f0e0171500f7c306c5fffffc7d0de9f306dc0a0b2a5d39cd2f57d5359f03d37f644716
+  data.tar.gz: 4d76928b54fc1f3937617d7042ff5f47b2b9f234f8436e6c533fd1622fa764e05d0d092e47e22778f7f7c6601c10239de51c541054f05ebe528de10a333c229f

data/lib/stagehand/active_record_extensions.rb

@@ -40,26 +40,31 @@ ActiveRecord::Base.class_eval do
 
   # MULTITHREADED CONNECTION HANDLING
 
+  class_attribute :stagehand_threadsafe_connections
+  self.stagehand_threadsafe_connections = true
+
   # The original implementation of remove_connection uses @connection_specification_name, which is shared across Threads.
   # We need to pass in the connection that model in the current thread is using if we call remove_connection.
   def self.remove_connection(name = StagehandConnectionMap.get(self))
+    return super unless stagehand_threadsafe_connections
+
     StagehandConnectionMap.set(self, nil)
     super
   end
 
   def self.connection_specification_name=(connection_name)
+    return super unless stagehand_threadsafe_connections
+
     # ActiveRecord sets the connection pool to 'primary' by default, so we want to reuse that connection for staging
     # in order to avoid using a different connection pool after our first swap back to the staging connection.
     connection_name == 'primary' if connection_name == Stagehand::Configuration.staging_connection_name
 
     StagehandConnectionMap.set(self, connection_name)
-
-    # We want to keep track of the @connection_specification_name as a fallback shared across threads in case we
-    # haven't set the connection on more than one thread.
-    super
   end
 
   def self.connection_specification_name
+    return super unless stagehand_threadsafe_connections
+
     StagehandConnectionMap.get(self) || super
   end
 

data/lib/stagehand/database.rb

@@ -1,4 +1,5 @@
 require 'thread'
+require 'stagehand/active_record_extensions'
 
 module Stagehand
   module Database
@@ -77,8 +78,6 @@ module Stagehand
     private
 
     def swap_connection(connection_name)
-      raise ConnectionSwapDuringTransaction unless safe_to_swap_connection?
-      
       cache = ActiveRecord::Base.connection_pool.query_cache_enabled
       ConnectionStack.push(connection_name.to_sym)
       ActiveRecord::Base.connection_specification_name = current_connection_name
@@ -91,10 +90,6 @@ module Stagehand
       ActiveRecord::Base.connection_pool.enable_query_cache! if cache
     end
 
-    def safe_to_swap_connection?
-      ActiveRecord::Base.connection.open_transactions == 0
-    end
-
     def current_connection_name
       ConnectionStack.last
     end
@@ -111,6 +106,7 @@ module Stagehand
 
     class Probe < ActiveRecord::Base
       self.abstract_class = true
+      self.stagehand_threadsafe_connections = false # We don't want to track connection per-thread for Probes
 
       # We fake the class name so we can create a connection pool with the desired connection name instead of the name of the class
       def self.init_connection(connection_name)
@@ -166,8 +162,4 @@ module Stagehand
       end
     end
   end
-
-  # EXCEPTIONS
-
-  class ConnectionSwapDuringTransaction < StandardError; end
 end

data/lib/stagehand/version.rb

@@ -1,3 +1,3 @@
 module Stagehand
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culturecode_stagehand
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails