switchman 3.3.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0730763611a9f47cf3b9a39d5e3a9969189067772c743bad82729c670d18e545
-  data.tar.gz: 4136ab04f9eac6c48ae4ad7a70b284845f095e3fc4153a8d5a5023f2bc5e312d
+  metadata.gz: eba3197eb56e020790a7ff144dc55f15bb9ad84f523728e70d7573aa5a778f2d
+  data.tar.gz: e8003ce68cf4ae8262f6d40c8229c44ceb785c8313e717fca2b00edadb8e61e9
 SHA512:
-  metadata.gz: ad391b862e5428999a5260278e767dae4a1266eb99fd2bab18619b26302542d67d50fee3277ff27711ce4eaec68fbf5428773d17b03b7d235e501baeb06a1623
-  data.tar.gz: 87cee001748bcea7ce0f46a4d673a2c7ac3aefb16b99f84d463fbaff3804a98cd53184dd271a3b19261f89baef91151d85728076b76484646d5be95af1f101cb
+  metadata.gz: dd810811744c3ebe8f6dcef36c00a0c04dbaaca70aaa574a33bd9496e204c3afcd0696088fa79e500eb28cc835738d3f273bebe9fc023c86794353348e41e6be
+  data.tar.gz: f7c6804dbb5abba70034eeae11b9cf2f77e42052fb23366a68d4b139eddfd9434ee6190f9d391112e82017187473bdc11ded1a62a474a02e113ff15d7d399a5a

data/lib/switchman/active_record/relation.rb

@@ -58,9 +58,10 @@ module Switchman
       end
 
       %I[update_all delete_all].each do |method|
+        arg_params = RUBY_VERSION <= '2.8' ? '*args' : '*args, **kwargs'
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{method}(*args)
-            result = self.activate(unordered: true) { |relation| relation.call_super(#{method.inspect}, Relation, *args) }
+          def #{method}(#{arg_params})
+            result = self.activate(unordered: true) { |relation| relation.call_super(#{method.inspect}, Relation, #{arg_params}) }
             result = result.sum if result.is_a?(Array)
             result
           end

data/lib/switchman/call_super.rb

@@ -12,8 +12,14 @@ module Switchman
       method.super_method
     end
 
-    def call_super(method, above_module, *args, &block)
-      super_method_above(method, above_module).call(*args, &block)
+    if RUBY_VERSION <= '2.8'
+      def call_super(method, above_module, *args, &block)
+        super_method_above(method, above_module).call(*args, &block)
+      end
+    else
+      def call_super(method, above_module, *args, **kwargs, &block)
+        super_method_above(method, above_module).call(*args, **kwargs, &block)
+      end
     end
   end
 end

data/lib/switchman/guard_rail/relation.rb

@@ -13,8 +13,9 @@ module Switchman
       end
 
       %w[update_all delete_all].each do |method|
+        arg_params = RUBY_VERSION <= '2.8' ? '*args' : '*args, **kwargs'
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{method}(*args)
+          def #{method}(#{arg_params})
             db = Shard.current(connection_class_for_self).database_server
             db.unguard { super }
           end

data/lib/switchman/shard.rb

@@ -120,7 +120,8 @@ module Switchman
       #                forking.
       #    exception: - :ignore, :raise, :defer (wait until the end and raise the first
       #                error), or a proc
-      def with_each_shard(*args, parallel: false, exception: :raise, &block)
+      #    output: - :simple, :decorated (with database_server_id:shard_name)
+      def with_each_shard(*args, parallel: false, exception: :raise, output: :simple)
         raise ArgumentError, "wrong number of arguments (#{args.length} for 0...2)" if args.length > 2
 
         return Array.wrap(yield) unless default.is_a?(Shard)
@@ -164,20 +165,21 @@ module Switchman
           parent_process_name = `ps -ocommand= -p#{Process.pid}`.slice(/#{$0}.*/)
           ret = ::Parallel.map(scopes, in_processes: scopes.length > 1 ? parallel : 0) do |server, subscope|
             name = server.id
-            # rubocop:disable Style/GlobalStdStream
-            $stdout = Parallel::PrefixingIO.new(name, STDOUT)
-            $stderr = Parallel::PrefixingIO.new(name, STDERR)
-            # rubocop:enable Style/GlobalStdStream
+            last_description = name
+
             begin
               max_length = 128 - name.length - 3
               short_parent_name = parent_process_name[0..max_length] if max_length >= 0
               new_title = [short_parent_name, name].join(' ')
               Process.setproctitle(new_title)
               Switchman.config[:on_fork_proc]&.call
-              with_each_shard(subscope, classes, exception: exception, &block).map { |result| Parallel::ResultWrapper.new(result) }
+              with_each_shard(subscope, classes, exception: exception, output: :decorated) do
+                last_description = Shard.current.description
+                Parallel::ResultWrapper.new(yield)
+              end
             rescue => e
               logger.error e.full_message
-              Parallel::QuietExceptionWrapper.new(name, ::Parallel::ExceptionWrapper.new(e))
+              Parallel::QuietExceptionWrapper.new(last_description, ::Parallel::ExceptionWrapper.new(e))
             end
           end.flatten
 
@@ -195,14 +197,20 @@ module Switchman
 
         classes ||= []
 
-        previous_shard = nil
         result = []
         ex = nil
+        old_stdout = $stdout
+        old_stderr = $stderr
         scope.each do |shard|
           # shard references a database server that isn't configured in this environment
           next unless shard.database_server
 
           shard.activate(*classes) do
+            if output == :decorated
+              $stdout = Parallel::PrefixingIO.new(shard.description, $stdout)
+              $stderr = Parallel::PrefixingIO.new(shard.description, $stderr)
+            end
+
             result.concat Array.wrap(yield)
           rescue
             case exception
@@ -216,8 +224,10 @@ module Switchman
             else
               raise
             end
+          ensure
+            $stdout = old_stdout
+            $stderr = old_stderr
           end
-          previous_shard = shard
         end
         raise ex if ex
 

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = '3.3.0'
+  VERSION = '3.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.2
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord