switchman 1.5.17 → 1.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f304aef7570bb1f9343ea6d41b7128ff22adf401
-  data.tar.gz: bbb189dda31a1ba8e286bbb880b39b493bd202cf
+  metadata.gz: 72cd0fd10611a4acc7c12f46ca25435689d9f3ea
+  data.tar.gz: 80a15da1b891e2945bf6c2ceb80c0bd95693d63f
 SHA512:
-  metadata.gz: c5fd27c1f879019eefe1290c63f5d1353756f627810d80f1d6f506d0b48b7ff49765827e061d288d5bdd7a4d35d597ffb42c7931aaaa4429e4464cefb10644ee
-  data.tar.gz: e863f8aa792c7324eb912b74d8c0ee4ebabd6184aa4eda77910e7726e9a6e37b34e90a718fc670a59eba6eb9860efb614eb021f64e53359d2e3cc03060a2cfeb
+  metadata.gz: 819f32885454df751e646e995b859b8ceb5549bb74f7f8e8dd4a0445c5423cb25ffccbf8dc84da32304f299e619469e9c1540af66537952751d5b3e31ee09384
+  data.tar.gz: a727cc6b22e0fb123adaf6514ccba6eb1330d9fa96e0410280bb063132852738f9dfe4d198caf271651ea4f0d6f7a1b0b23d20e7c5ec157e790cc6e59d484dba

data/lib/switchman/engine.rb

@@ -86,6 +86,9 @@ module Switchman
         require "switchman/rails"
         require "switchman/shackles/relation"
         require "switchman/shard_internal"
+        require "switchman/standard_error"
+
+        ::StandardError.include(StandardError)
 
         include ActiveRecord::Base
         include ActiveRecord::AttributeMethods

data/lib/switchman/standard_error.rb

@@ -0,0 +1,12 @@
+module Switchman
+  module StandardError
+    def initialize(*args)
+      @active_shards = Shard.send(:active_shards).dup
+      super
+    end
+
+    def current_shard(category = :default)
+      @active_shards[category] || Shard.default
+    end
+  end
+end

data/lib/switchman/version.rb

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

data/lib/tasks/switchman.rake

@@ -56,15 +56,20 @@ module Switchman
         end
 
         ::Shackles.activate(:deploy) do
-          Shard.with_each_shard(scope, Shard.categories, options) 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 { |action| action.call(*task_args) }
+          begin
+            Shard.with_each_shard(scope, Shard.categories, options) 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 { |action| action.call(*task_args) }
+              end
+              nil
             end
-            nil
+          rescue => e
+            puts "Exception from #{e.current_shard.id}: #{e.current_shard.description}" if options[:parallel] != 0
+            raise
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.5.17
+  version: 1.5.18
 platform: ruby
 authors:
 - Cody Cutrer
@@ -202,6 +202,7 @@ files:
 - lib/switchman/shackles.rb
 - lib/switchman/shackles/relation.rb
 - lib/switchman/sharded_instrumenter.rb
+- lib/switchman/standard_error.rb
 - lib/switchman/test_helper.rb
 - lib/switchman/version.rb
 - lib/tasks/switchman.rake