switchman 1.5.18 → 1.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72cd0fd10611a4acc7c12f46ca25435689d9f3ea
-  data.tar.gz: 80a15da1b891e2945bf6c2ceb80c0bd95693d63f
+  metadata.gz: 65bb936a3b1c3df9044c0c8429a6e7b01b0bafb3
+  data.tar.gz: a1e4e5e2c846e10fd95f1916a175b5327e4429d1
 SHA512:
-  metadata.gz: 819f32885454df751e646e995b859b8ceb5549bb74f7f8e8dd4a0445c5423cb25ffccbf8dc84da32304f299e619469e9c1540af66537952751d5b3e31ee09384
-  data.tar.gz: a727cc6b22e0fb123adaf6514ccba6eb1330d9fa96e0410280bb063132852738f9dfe4d198caf271651ea4f0d6f7a1b0b23d20e7c5ec157e790cc6e59d484dba
+  metadata.gz: 3d7888becfe60dd1e14255cfca4c3492268ea4048133819a2aa40de66c696b0dd6c4965c66eb82bb68603346afdc43b3f5b8ee636da2ff36a58db7bd0628a52c
+  data.tar.gz: bf563c2246872f3afb630f93e08906b55f8e6e7f63a92cd0c765cd87a1fb21120634b375a011fa5b29793c293400ccc96bca83d4796025d15d6985ccc138825f

data/app/models/switchman/shard_internal.rb

@@ -249,14 +249,20 @@ module Switchman
             end
           end
 
+          # only one process; don't bother forking
+          if scopes.length == 1 && parallel == 1
+            return with_each_shard(subscopes.first, categories, options) { yield }
+          end
+
+          # clear connections prior to forking (no more queries will be executed in the parent,
+          # and we want them gone so that we don't accidentally use them post-fork doing something
+          # silly like dealloc'ing prepared statements)
+          ::ActiveRecord::Base.clear_all_connections!
+
           scopes.each do |server, subscopes|
             if !(::ActiveRecord::Relation === subscopes.first) && subscopes.first.class != Array
               subscopes = [subscopes]
             end
-            # only one process; don't bother forking
-            if scopes.length == 1 && subscopes.length == 1
-              return with_each_shard(subscopes.first, categories, options) { yield }
-            end
 
             subscopes.each_with_index do |subscope, idx|
               if subscopes.length > 1
@@ -269,13 +275,23 @@ module Switchman
               exception_pipes << exception_pipe
               pid, io_in, io_out, io_err = Open4.pfork4(lambda do
                 begin
-                  ::ActiveRecord::Base.clear_all_connections!
                   Switchman.config[:on_fork_proc].try(:call)
                   $0 = [$0, ARGV, name].flatten.join(' ')
                   with_each_shard(subscope, categories, options) { yield }
                   exception_pipe.last.close
-                rescue Exception => e
-                  Marshal.dump(e, exception_pipe.last)
+                rescue => e
+                  begin
+                    dumped = Marshal.dump(e)
+                  rescue
+                    # couldn't dump the exception; create a copy with just
+                    # the message and the backtrace
+                    e2 = e.class.new(e.message)
+                    e2.set_backtrace(e.backtrace)
+                    e2.instance_variable_set(:@active_shards, e.instance_variable_get(:@active_shards))
+                    dumped = Marshal.dump(e2)
+                  end
+                  exception_pipe.last.set_encoding(dumped.encoding)
+                  exception_pipe.last.write(dumped)
                   exception_pipe.last.flush
                   exception_pipe.last.close
                   exit! 1
@@ -311,9 +327,6 @@ module Switchman
             errors << pid_to_name_map[pid] if status.exitstatus != 0
           end
 
-          # I'm not sure why, but we have to do this
-          ::ActiveRecord::Base.clear_all_connections!
-
           # check for an exception; we only re-raise the first one
           exception_pipes.each do |exception_pipe|
             begin

data/lib/switchman/active_record/query_cache.rb

@@ -52,7 +52,7 @@ module Switchman
           arel, binds = binds_from_relation(arel, binds)
           sql = to_sql(arel, binds)
           if ::Rails.version >= '5'
-            cache_sql(sql, binds) { super(sql, name, binds, preparable: visitor.preparable) }
+            cache_sql(sql, binds) { super(sql, name, binds, preparable: preparable) }
           else
             cache_sql(sql, binds) { super(sql, name, binds) }
           end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.5.18"
+  VERSION = "1.5.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.5.18
+  version: 1.5.19
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties