sidekiq 6.3.1 → 6.4.1

data/lib/sidekiq/worker.rb

@@ -171,6 +171,8 @@ module Sidekiq
     #     SomeWorker.set(queue: 'foo').perform_async(....)
     #
     class Setter
+      include Sidekiq::JobUtil
+
       def initialize(klass, opts)
         @klass = klass
         @opts = opts
@@ -188,13 +190,59 @@ module Sidekiq
       end
 
       def perform_async(*args)
-        @klass.client_push(@opts.merge("args" => args, "class" => @klass))
+        if @opts["sync"] == true
+          perform_inline(*args)
+        else
+          @klass.client_push(@opts.merge("args" => args, "class" => @klass))
+        end
+      end
+
+      # Explicit inline execution of a job. Returns nil if the job did not
+      # execute, true otherwise.
+      def perform_inline(*args)
+        raw = @opts.merge("args" => args, "class" => @klass).transform_keys(&:to_s)
+
+        # validate and normalize payload
+        item = normalize_item(raw)
+        queue = item["queue"]
+
+        # run client-side middleware
+        result = Sidekiq.client_middleware.invoke(item["class"], item, queue, Sidekiq.redis_pool) do
+          item
+        end
+        return nil unless result
+
+        # round-trip the payload via JSON
+        msg = Sidekiq.load_json(Sidekiq.dump_json(item))
+
+        # prepare the job instance
+        klass = msg["class"].constantize
+        job = klass.new
+        job.jid = msg["jid"]
+        job.bid = msg["bid"] if job.respond_to?(:bid)
+
+        # run the job through server-side middleware
+        result = Sidekiq.server_middleware.invoke(job, msg, msg["queue"]) do
+          # perform it
+          job.perform(*msg["args"])
+          true
+        end
+        return nil unless result
+        # jobs do not return a result. they should store any
+        # modified state.
+        true
       end
+      alias_method :perform_sync, :perform_inline
 
       def perform_bulk(args, batch_size: 1_000)
-        args.each_slice(batch_size).flat_map do |slice|
-          Sidekiq::Client.push_bulk(@opts.merge("class" => @klass, "args" => slice))
+        hash = @opts.transform_keys(&:to_s)
+        pool = Thread.current[:sidekiq_via_pool] || @klass.get_sidekiq_options["pool"] || Sidekiq.redis_pool
+        client = Sidekiq::Client.new(pool)
+        result = args.each_slice(batch_size).flat_map do |slice|
+          client.push_bulk(hash.merge("class" => @klass, "args" => slice))
         end
+
+        result.is_a?(Enumerator::Lazy) ? result.force : result
       end
 
       # +interval+ must be a timestamp, numeric or something that acts
@@ -238,7 +286,12 @@ module Sidekiq
       end
 
       def perform_async(*args)
-        client_push("class" => self, "args" => args)
+        Setter.new(self, {}).perform_async(*args)
+      end
+
+      # Inline execution of job's perform method after passing through Sidekiq.client_middleware and Sidekiq.server_middleware
+      def perform_inline(*args)
+        Setter.new(self, {}).perform_inline(*args)
       end
 
       ##
@@ -261,10 +314,8 @@ module Sidekiq
       #
       #     SomeWorker.perform_bulk([[1], [2], [3]])
       #
-      def perform_bulk(items, batch_size: 1_000)
-        items.each_slice(batch_size).flat_map do |slice|
-          Sidekiq::Client.push_bulk("class" => self, "args" => slice)
-        end
+      def perform_bulk(*args, **kwargs)
+        Setter.new(self, {}).perform_bulk(*args, **kwargs)
       end
 
       # +interval+ must be a timestamp, numeric or something that acts

data/lib/sidekiq.rb

@@ -26,6 +26,7 @@ module Sidekiq
     timeout: 25,
     poll_interval_average: nil,
     average_scheduled_poll_interval: 5,
+    on_complex_arguments: :warn,
     error_handlers: [],
     death_handlers: [],
     lifecycle_events: {
@@ -102,6 +103,7 @@ module Sidekiq
         # to disconnect and reopen the socket to get back to the primary.
         # 4495 Use the same logic if we have a "Not enough replicas" error from the primary
         # 4985 Use the same logic when a blocking command is force-unblocked
+        # The same retry logic is also used in client.rb
         if retryable && ex.message =~ /READONLY|NOREPLICAS|UNBLOCKED/
           conn.disconnect!
           retryable = false
@@ -252,6 +254,10 @@ module Sidekiq
     options[:lifecycle_events][event] << block
   end
 
+  def self.strict_args!(mode = :raise)
+    options[:on_complex_arguments] = mode
+  end
+
   # We are shutting down Sidekiq but what about workers that
   # are working on some long job?  This error is
   # raised in workers that have not finished within the hard

data/web/assets/stylesheets/application-dark.css

@@ -1,6 +1,6 @@
 html, body {
-  background-color: #333 !important;
-  color: #ddd;
+  background-color: #171717 !important;
+  color: #DEDEDE;
 }
 
 a,
@@ -30,15 +30,15 @@ span.current-interval,
 
 .navbar-inverse {
   background-color: #222;
-  border-color: #555;
+  border-color: #444;
 }
 
 table {
-  background-color: #282828;
+  background-color: #1D1D1D;
 }
 
 .table-striped > tbody > tr:nth-of-type(odd) {
-  background-color: #333;
+  background-color: #2E2E2E;
 }
 
 .table-bordered,
@@ -48,7 +48,7 @@ table {
 .table-bordered > tfoot > tr > th,
 .table-bordered > thead > tr > td,
 .table-bordered > thead > tr > th {
-  border: 1px solid #555;
+  border: 1px solid #444;
 }
 
 .table-hover > tbody > tr:hover {
@@ -72,9 +72,7 @@ table {
   background-color: #31708f;
 }
 
-a:link,
-a:active,
-a:hover {
+a:link, a:active, a:hover, a:visited {
   color: #ddd;
 }
 
@@ -85,15 +83,13 @@ input {
 }
 
 .summary_bar .summary {
-  background-color: #222;
-  border: 1px solid #555;
-
-  box-shadow: 0 0 5px rgba(255, 255, 255, .5);
+  background-color: #232323;
+  border: 1px solid #444;
 }
 
 .navbar-default {
-  background-color: #222;
-  border-color: #555;
+  background-color: #0F0F0F;
+  border-color: #444;
 }
 
 .navbar-default .navbar-nav > .active > a,
@@ -112,7 +108,7 @@ input {
 .pagination > li > span {
   color: #ddd;
   background-color: #333;
-  border-color: #555;
+  border-color: #444;
 }
 .pagination > .disabled > a,
 .pagination > .disabled > a:focus,
@@ -122,7 +118,7 @@ input {
 .pagination > .disabled > span:hover {
   color: #ddd;
   background-color: #333;
-  border-color: #555;
+  border-color: #444;
 }
 
 .stat {

data/web/assets/stylesheets/application.css

@@ -21,7 +21,7 @@ body {
 a {
   color: #b1003e;
 }
-a:active, a:hover {
+a:active, a:hover, a:focus {
   color: #4b001a;
 }
 
@@ -89,11 +89,10 @@ header.row .pagination {
 .summary_bar .summary {
   margin-top: 12px;
   background-color: #fff;
-  box-shadow: 0 0 5px rgba(50, 50, 50, 0.25);
   border-radius: 4px;
+  border: 1px solid rgba(0, 0, 0, 0.1);
   padding: 8px;
   margin-bottom: 10px;
-  border-width: 0;
 }
 .poll-wrapper {
     margin: 9px;
@@ -203,6 +202,8 @@ table .table-checkbox label {
 
 .navbar .navbar-brand .status {
   color: #585454;
+  display: inline-block;
+  width: 75px;
 }
 
 
@@ -350,6 +351,7 @@ img.smallogo {
   text-align: center;
   margin-right: 20px;
   border: 1px solid rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
   padding: 5px;
   width: 150px;
   margin-bottom: 20px;
@@ -405,8 +407,6 @@ span.current-interval {
 
 div.interval-slider input {
   width: 160px;
-  height: 3px;
-  margin-top: 5px;
   border-radius: 2px;
   background: currentcolor;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.4.1
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-07 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -67,10 +67,10 @@ files:
 - bin/sidekiq
 - bin/sidekiqload
 - bin/sidekiqmon
-- lib/generators/sidekiq/templates/worker.rb.erb
-- lib/generators/sidekiq/templates/worker_spec.rb.erb
-- lib/generators/sidekiq/templates/worker_test.rb.erb
-- lib/generators/sidekiq/worker_generator.rb
+- lib/generators/sidekiq/job_generator.rb
+- lib/generators/sidekiq/templates/job.rb.erb
+- lib/generators/sidekiq/templates/job_spec.rb.erb
+- lib/generators/sidekiq/templates/job_test.rb.erb
 - lib/sidekiq.rb
 - lib/sidekiq/api.rb
 - lib/sidekiq/cli.rb
@@ -85,6 +85,7 @@ files:
 - lib/sidekiq/job.rb
 - lib/sidekiq/job_logger.rb
 - lib/sidekiq/job_retry.rb
+- lib/sidekiq/job_util.rb
 - lib/sidekiq/launcher.rb
 - lib/sidekiq/logger.rb
 - lib/sidekiq/manager.rb
@@ -192,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Simple, efficient background processing for Ruby

data/lib/generators/sidekiq/worker_generator.rb

@@ -1,57 +0,0 @@
-require "rails/generators/named_base"
-
-module Sidekiq
-  module Generators # :nodoc:
-    class WorkerGenerator < ::Rails::Generators::NamedBase # :nodoc:
-      desc "This generator creates a Sidekiq Worker in app/workers and a corresponding test"
-
-      check_class_collision suffix: "Worker"
-
-      def self.default_generator_root
-        File.dirname(__FILE__)
-      end
-
-      def create_worker_file
-        template "worker.rb.erb", File.join("app/workers", class_path, "#{file_name}_worker.rb")
-      end
-
-      def create_test_file
-        return unless test_framework
-
-        if test_framework == :rspec
-          create_worker_spec
-        else
-          create_worker_test
-        end
-      end
-
-      private
-
-      def create_worker_spec
-        template_file = File.join(
-          "spec/workers",
-          class_path,
-          "#{file_name}_worker_spec.rb"
-        )
-        template "worker_spec.rb.erb", template_file
-      end
-
-      def create_worker_test
-        template_file = File.join(
-          "test/workers",
-          class_path,
-          "#{file_name}_worker_test.rb"
-        )
-        template "worker_test.rb.erb", template_file
-      end
-
-      def file_name
-        @_file_name ||= super.sub(/_?worker\z/i, "")
-      end
-
-      def test_framework
-        ::Rails.application.config.generators.options[:rails][:test_framework]
-      end
-    end
-  end
-end