sidekiq 7.0.1 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98aab60f0a9bd14122cf62b2f31c17e41b67feb8c9fb13865ef0a16002d38ed7
-  data.tar.gz: 94038f0176ccb7785c6112cd41e915e4a1c7f66298a9670457a68e6b62f2710c
+  metadata.gz: 93289a9aed52b658b609cb6de99fefe182003d71bcc0102fa82fa33d53a70f5b
+  data.tar.gz: 1ca1b7ff222845a4a6f23ea00d77826c248a8e45db176eb9f2194afef70dface
 SHA512:
-  metadata.gz: c41c724dc99aa3fdf49db46eeac0bec822bd6a67989792f4830900da7b74882c27837535a03a2ea6ed0575736fc895b23bb3440613d1f581e877bcbfe1c06934
-  data.tar.gz: 482af09f25f72f9fa0261f02e4e224dc58a400519f167f8cb0ea0dda4960b24a41b105731a4fcc2b81ff15f158497b9bf1cc86d55272ed8fe4ca7ed9029bc047
+  metadata.gz: 680961f7df970445211487780291ecc1adb738fa834126428bbb814b0b7b03e912889c66020079f24aaf548a023c9621e601631d66dd6f7f467e9f8ac5085fee
+  data.tar.gz: cdd1e337afbba5aaea110227e8b91e1b965e05c6ff9a5b7f5202850e3725d4d6959137dd8f47075057230451e394dca3ca0cbe5c7d70ef33ac6284a21e7fbea4

data/Changes.md

@@ -2,6 +2,38 @@
 
 [Sidekiq Changes](https://github.com/mperham/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/main/Ent-Changes.md)
 
+7.0.3
+----------
+
+- Don't warn about memory policy on Redis Enterprise [#5712]
+- Don't allow Quiet/Stop on embedded Sidekiq instances [#5716]
+- Fix `size: X` for configuring the default Redis pool size [#5702]
+- Improve the display of queue weights on Busy page [#5642]
+- Freeze CurrentAttributes on a job once initially set [#5692]
+
+7.0.2
+----------
+
+- Improve compatibility with custom loggers [#5673]
+- Add queue weights on Busy page [#5640]
+- Add BID link on job_info page if job is part of a Batch [#5623]
+- Allow custom extensions to add rows/links within Job detail pages [#5624]
+```ruby
+Sidekiq::Web.custom_job_info_rows << AddAccountLink.new
+
+class AddAccountLink
+  include CGI::Util
+  def add_pair(job)
+    # yield a (name, value) pair
+    # You can include HTML tags and CSS, Sidekiq does not do any
+    # escaping so beware user data injection! Note how we use CGI's
+    # `h` escape helper.
+    aid = job["account_id"]
+    yield "Account", "<a href='/accounts/#{h aid}'>#{h aid}</a>" if aid
+  end
+end
+```
+
 7.0.1
 ----------
 

data/lib/sidekiq/api.rb

@@ -418,6 +418,10 @@ module Sidekiq
       self["jid"]
     end
 
+    def bid
+      self["bid"]
+    end
+
     def enqueued_at
       self["enqueued_at"] ? Time.at(self["enqueued_at"]).utc : nil
     end
@@ -824,6 +828,24 @@ module Sidekiq
   class ProcessSet
     include Enumerable
 
+    def self.[](identity)
+      exists, (info, busy, beat, quiet, rss, rtt_us) = Sidekiq.redis { |conn|
+        conn.multi { |transaction|
+          transaction.sismember("processes", identity)
+          transaction.hmget(identity, "info", "busy", "beat", "quiet", "rss", "rtt_us")
+        }
+      }
+
+      return nil if exists == 0 || info.nil?
+
+      hash = Sidekiq.load_json(info)
+      Process.new(hash.merge("busy" => busy.to_i,
+        "beat" => beat.to_f,
+        "quiet" => quiet,
+        "rss" => rss.to_i,
+        "rtt_us" => rtt_us.to_i))
+    end
+
     # :nodoc:
     # @api private
     def initialize(clean_plz = true)
@@ -872,7 +894,7 @@ module Sidekiq
         end
       }
 
-      result.each do |info, busy, at_s, quiet, rss, rtt|
+      result.each do |info, busy, beat, quiet, rss, rtt_us|
         # If a process is stopped between when we query Redis for `procs` and
         # when we query for `result`, we will have an item in `result` that is
         # composed of `nil` values.
@@ -880,10 +902,10 @@ module Sidekiq
 
         hash = Sidekiq.load_json(info)
         yield Process.new(hash.merge("busy" => busy.to_i,
-          "beat" => at_s.to_f,
+          "beat" => beat.to_f,
           "quiet" => quiet,
           "rss" => rss.to_i,
-          "rtt_us" => rtt.to_i))
+          "rtt_us" => rtt_us.to_i))
       end
     end
 
@@ -939,6 +961,7 @@ module Sidekiq
   #   'busy' => 10,
   #   'beat' => <last heartbeat>,
   #   'identity' => <unique string identifying the process>,
+  #   'embedded' => true,
   # }
   class Process
     # :nodoc:
@@ -967,11 +990,25 @@ module Sidekiq
       self["queues"]
     end
 
+    def weights
+      self["weights"]
+    end
+
+    def version
+      self["version"]
+    end
+
+    def embedded?
+      self["embedded"]
+    end
+
     # Signal this process to stop processing new jobs.
     # It will continue to execute jobs it has already fetched.
     # This method is *asynchronous* and it can take 5-10
     # seconds for the process to quiet.
     def quiet!
+      raise "Can't quiet an embedded process" if embedded?
+
       signal("TSTP")
     end
 
@@ -980,6 +1017,8 @@ module Sidekiq
     # This method is *asynchronous* and it can take 5-10
     # seconds for the process to start shutting down.
     def stop!
+      raise "Can't stop an embedded process" if embedded?
+
       signal("TERM")
     end
 

data/lib/sidekiq/capsule.rb

@@ -21,12 +21,15 @@ module Sidekiq
     attr_reader :name
     attr_reader :queues
     attr_accessor :concurrency
+    attr_reader :mode
+    attr_reader :weights
 
     def initialize(name, config)
       @name = name
       @config = config
       @queues = ["default"]
       @concurrency = config[:concurrency]
+      @mode = :strict
     end
 
     def fetcher
@@ -41,15 +44,28 @@ module Sidekiq
       fetcher&.bulk_requeue([])
     end
 
+    # Sidekiq checks queues in three modes:
+    # - :strict - all queues have 0 weight and are checked strictly in order
+    # - :weighted - queues have arbitrary weight between 1 and N
+    # - :random - all queues have weight of 1
     def queues=(val)
+      @weights = {}
       @queues = Array(val).each_with_object([]) do |qstr, memo|
         arr = qstr
         arr = qstr.split(",") if qstr.is_a?(String)
         name, weight = arr
+        @weights[name] = weight.to_i
         [weight.to_i, 1].max.times do
           memo << name
         end
       end
+      @mode = if @weights.values.all?(&:zero?)
+        :strict
+      elsif @weights.values.all? { |x| x == 1 }
+        :random
+      else
+        :weighted
+      end
     end
 
     # Allow the middleware to be different per-capsule.

data/lib/sidekiq/cli.rb

@@ -77,7 +77,8 @@ module Sidekiq # :nodoc:
       raise "You are connecting to Redis #{ver}, Sidekiq requires Redis 6.2.0 or greater" if ver < Gem::Version.new("6.2.0")
 
       maxmemory_policy = info["maxmemory_policy"]
-      if maxmemory_policy != "noeviction"
+      if maxmemory_policy != "noeviction" && maxmemory_policy != ""
+        # Redis Enterprise Cloud returns "" for their policy 😳
         logger.warn <<~EOM
 
 

data/lib/sidekiq/client.rb

@@ -189,7 +189,7 @@ module Sidekiq
       def enqueue_to_in(queue, interval, klass, *args)
         int = interval.to_f
         now = Time.now.to_f
-        ts = (int < 1_000_000_000 ? now + int : int)
+        ts = ((int < 1_000_000_000) ? now + int : int)
 
         item = {"class" => klass, "args" => args, "at" => ts, "queue" => queue}
         item.delete("at") if ts <= now

data/lib/sidekiq/config.rb

@@ -129,12 +129,12 @@ module Sidekiq
     def new_redis_pool(size, name = "unset")
       # connection pool is lazy, it will not create connections unless you actually need them
       # so don't be skimpy!
-      RedisConnection.create(@redis_config.merge(size: size, logger: logger, pool_name: name))
+      RedisConnection.create({size: size, logger: logger, pool_name: name}.merge(@redis_config))
     end
 
     def redis_info
       redis do |conn|
-        conn.info
+        conn.call("INFO") { |i| i.lines(chomp: true).map { |l| l.split(":", 2) }.select { |l| l.size == 2 }.to_h }
       rescue RedisClientAdapter::CommandError => ex
         # 2850 return fake version when INFO command has (probably) been renamed
         raise unless /unknown command/.match?(ex.message)
@@ -248,7 +248,6 @@ module Sidekiq
         return
       end
 
-      logger.extend(Sidekiq::LoggingUtils)
       @logger = logger
     end
 

data/lib/sidekiq/deploy.rb

@@ -21,15 +21,15 @@ module Sidekiq
     }
 
     def self.mark!(label = nil)
-      label ||= LABEL_MAKER.call
-      Sidekiq::Deploy.new.mark(label: label)
+      Sidekiq::Deploy.new.mark!(label: label)
     end
 
     def initialize(pool = Sidekiq::RedisConnection.create)
       @pool = pool
     end
 
-    def mark(at: Time.now, label: "")
+    def mark!(at: Time.now, label: nil)
+      label ||= LABEL_MAKER.call
       # we need to round the timestamp so that we gracefully
       # handle an very common error in marking deploys:
       # having every process mark its deploy, leading

data/lib/sidekiq/fetch.rb

@@ -30,11 +30,9 @@ module Sidekiq # :nodoc:
     def initialize(cap)
       raise ArgumentError, "missing queue list" unless cap.queues
       @config = cap
-      @strictly_ordered_queues = (config.queues.size == config.queues.uniq.size)
+      @strictly_ordered_queues = cap.mode == :strict
       @queues = config.queues.map { |q| "queue:#{q}" }
-      if @strictly_ordered_queues
-        @queues.uniq!
-      end
+      @queues.uniq! if @strictly_ordered_queues
     end
 
     def retrieve_work

data/lib/sidekiq/job.rb

@@ -258,7 +258,7 @@ module Sidekiq
       def at(interval)
         int = interval.to_f
         now = Time.now.to_f
-        ts = (int < 1_000_000_000 ? now + int : int)
+        ts = ((int < 1_000_000_000) ? now + int : int)
         # Optimization to enqueue something now that is scheduled to go out now or in the past
         @opts["at"] = ts if ts > now
         self
@@ -325,7 +325,7 @@ module Sidekiq
       def perform_in(interval, *args)
         int = interval.to_f
         now = Time.now.to_f
-        ts = (int < 1_000_000_000 ? now + int : int)
+        ts = ((int < 1_000_000_000) ? now + int : int)
 
         item = {"class" => self, "args" => args}
 

data/lib/sidekiq/job_logger.rb

@@ -33,7 +33,7 @@ module Sidekiq
 
       Thread.current[:sidekiq_context] = h
       level = job_hash["log_level"]
-      if level
+      if level && @logger.respond_to?(:log_at)
         @logger.log_at(level, &block)
       else
         yield

data/lib/sidekiq/job_retry.rb

@@ -49,7 +49,7 @@ module Sidekiq
   # The default number of retries is 25 which works out to about 3 weeks
   # You can change the default maximum number of retries in your initializer:
   #
-  #   Sidekiq.options[:max_retries] = 7
+  #   Sidekiq.default_configuration[:max_retries] = 7
   #
   # or limit the number of retries for a particular job and send retries to
   # a low priority queue with:

data/lib/sidekiq/launcher.rb

@@ -161,7 +161,7 @@ module Sidekiq
         fails = procd = 0
         kb = memory_usage(::Process.pid)
 
-        _, exists, _, _, msg = redis { |conn|
+        _, exists, _, _, signal = redis { |conn|
           conn.multi { |transaction|
             transaction.sadd("processes", [key])
             transaction.exists(key)
@@ -180,9 +180,7 @@ module Sidekiq
         fire_event(:heartbeat) unless exists > 0
         fire_event(:beat, oneshot: false)
 
-        return unless msg
-
-        ::Process.kill(msg, ::Process.pid)
+        ::Process.kill(signal, ::Process.pid) if signal && !@embedded
       rescue => e
         # ignore all redis/network issues
         logger.error("heartbeat: #{e}")
@@ -250,12 +248,19 @@ module Sidekiq
         "pid" => ::Process.pid,
         "tag" => @config[:tag] || "",
         "concurrency" => @config.total_concurrency,
-        "queues" => @config.capsules.values.map { |cap| cap.queues }.flatten.uniq,
+        "queues" => @config.capsules.values.flat_map { |cap| cap.queues }.uniq,
+        "weights" => to_weights,
         "labels" => @config[:labels].to_a,
-        "identity" => identity
+        "identity" => identity,
+        "version" => Sidekiq::VERSION,
+        "embedded" => @embedded
       }
     end
 
+    def to_weights
+      @config.capsules.values.map(&:weights)
+    end
+
     def to_json
       # this data changes infrequently so dump it to a string
       # now so we don't need to dump it every heartbeat.

data/lib/sidekiq/metrics/query.rb

@@ -123,7 +123,7 @@ module Sidekiq
         def series_avg(metric = "ms")
           series[metric].each_with_object(Hash.new(0)) do |(bucket, value), result|
             completed = series.dig("p", bucket) - series.dig("f", bucket)
-            result[bucket] = completed == 0 ? 0 : value.to_f / completed
+            result[bucket] = (completed == 0) ? 0 : value.to_f / completed
           end
         end
       end

data/lib/sidekiq/middleware/current_attributes.rb

@@ -22,13 +22,11 @@ module Sidekiq
       end
 
       def call(_, job, _, _)
-        attrs = @strklass.constantize.attributes
-        if attrs.any?
-          if job.has_key?("cattr")
-            job["cattr"].merge!(attrs)
-          else
-            job["cattr"] = attrs
-          end
+        if !job.has_key?("cattr")
+          attrs = @strklass.constantize.attributes
+          # Retries can push the job N times, we don't
+          # want retries to reset cattr. #5692, #5090
+          job["cattr"] = attrs if attrs.any?
         end
         yield
       end

data/lib/sidekiq/monitor.rb

@@ -49,10 +49,25 @@ class Sidekiq::Monitor
     def processes
       puts "---- Processes (#{process_set.size}) ----"
       process_set.each_with_index do |process, index|
+        # Keep compatibility with legacy versions since we don't want to break sidekiqmon during rolling upgrades or downgrades.
+        #
+        # Before:
+        #   ["default", "critical"]
+        #
+        # After:
+        #   {"default" => 1, "critical" => 10}
+        queues =
+          if process["weights"]
+            process["weights"].sort_by { |queue| queue[0] }.map { |queue| queue.join(": ") }
+          else
+            process["queues"].sort
+          end
+
         puts "#{process["identity"]} #{tags_for(process)}"
         puts "  Started: #{Time.at(process["started_at"])} (#{time_ago(process["started_at"])})"
         puts "  Threads: #{process["concurrency"]} (#{process["busy"]} busy)"
-        puts "   Queues: #{split_multiline(process["queues"].sort, pad: 11)}"
+        puts "   Queues: #{split_multiline(queues, pad: 11)}"
+        puts "  Version: #{process["version"] || "Unknown"}" if process["version"] != Sidekiq::VERSION
         puts "" unless (index + 1) == process_set.size
       end
     end
@@ -101,7 +116,7 @@ class Sidekiq::Monitor
       tags = [
         process["tag"],
         process["labels"],
-        (process["quiet"] == "true" ? "quiet" : nil)
+        ((process["quiet"] == "true") ? "quiet" : nil)
       ].flatten.compact
       tags.any? ? "[#{tags.join("] [")}]" : nil
     end

data/lib/sidekiq/paginator.rb

@@ -3,7 +3,7 @@
 module Sidekiq
   module Paginator
     def page(key, pageidx = 1, page_size = 25, opts = nil)
-      current_page = pageidx.to_i < 1 ? 1 : pageidx.to_i
+      current_page = (pageidx.to_i < 1) ? 1 : pageidx.to_i
       pageidx = current_page - 1
       total_size = 0
       items = []
@@ -45,7 +45,7 @@ module Sidekiq
     end
 
     def page_items(items, pageidx = 1, page_size = 25)
-      current_page = pageidx.to_i < 1 ? 1 : pageidx.to_i
+      current_page = (pageidx.to_i < 1) ? 1 : pageidx.to_i
       pageidx = current_page - 1
       starting = pageidx * page_size
       items = items.to_a

data/lib/sidekiq/rails.rb

@@ -11,7 +11,8 @@ module Sidekiq
       end
 
       def call
-        @app.reloader.wrap do
+        params = (::Rails::VERSION::STRING >= "7.1") ? {source: "job.sidekiq"} : {}
+        @app.reloader.wrap(**params) do
           yield
         end
       end

data/lib/sidekiq/redis_client_adapter.rb

@@ -9,10 +9,12 @@ module Sidekiq
     CommandError = RedisClient::CommandError
 
     module CompatMethods
+      # TODO Deprecate and remove this
       def info
         @client.call("INFO") { |i| i.lines(chomp: true).map { |l| l.split(":", 2) }.select { |l| l.size == 2 }.to_h }
       end
 
+      # TODO Deprecate and remove this
       def evalsha(sha, keys, argv)
         @client.call("EVALSHA", sha, keys.size, *keys, *argv)
       end
@@ -34,12 +36,7 @@ module Sidekiq
     CompatClient = RedisClient::Decorator.create(CompatMethods)
 
     class CompatClient
-      # underscore methods are not official API
-      def _client
-        @client
-      end
-
-      def _config
+      def config
         @client.config
       end
 

data/lib/sidekiq/scheduled.rb

@@ -54,7 +54,7 @@ module Sidekiq
           @lua_zpopbyscore_sha = conn.script(:load, LUA_ZPOPBYSCORE)
         end
 
-        conn.evalsha(@lua_zpopbyscore_sha, keys, argv)
+        conn.call("EVALSHA", @lua_zpopbyscore_sha, keys.size, *keys, *argv)
       rescue RedisClient::CommandError => e
         raise unless e.message.start_with?("NOSCRIPT")
 

data/lib/sidekiq/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "7.0.1"
+  VERSION = "7.0.3"
   MAJOR = 7
 end

data/lib/sidekiq/web/application.rb

@@ -82,11 +82,14 @@ module Sidekiq
 
     post "/busy" do
       if params["identity"]
-        p = Sidekiq::Process.new("identity" => params["identity"])
-        p.quiet! if params["quiet"]
-        p.stop! if params["stop"]
+        pro = Sidekiq::ProcessSet[params["identity"]]
+
+        pro.quiet! if params["quiet"]
+        pro.stop! if params["stop"]
       else
         processes.each do |pro|
+          next if pro.embedded?
+
           pro.quiet! if params["quiet"]
           pro.stop! if params["stop"]
         end

data/lib/sidekiq/web/helpers.rb

@@ -137,7 +137,7 @@ module Sidekiq
     end
 
     def sort_direction_label
-      params[:direction] == "asc" ? "↑" : "↓"
+      (params[:direction] == "asc") ? "↑" : "↓"
     end
 
     def workset
@@ -161,13 +161,21 @@ module Sidekiq
       end
     end
 
+    def busy_weights(capsule_weights)
+      # backwards compat with 7.0.0, remove in 7.1
+      cw = [capsule_weights].flatten
+      cw.map { |hash|
+        hash.map { |name, weight| (weight > 0) ? +name << ": " << weight.to_s : name }.join(", ")
+      }.join("; ")
+    end
+
     def stats
       @stats ||= Sidekiq::Stats.new
     end
 
     def redis_url
       Sidekiq.redis do |conn|
-        conn._config.server_url
+        conn.config.server_url
       end
     end
 
@@ -184,7 +192,7 @@ module Sidekiq
     end
 
     def current_status
-      workset.size == 0 ? "idle" : "active"
+      (workset.size == 0) ? "idle" : "active"
     end
 
     def relative_time(time)
@@ -217,7 +225,7 @@ module Sidekiq
     end
 
     def truncate(text, truncate_after_chars = 2000)
-      truncate_after_chars && text.size > truncate_after_chars ? "#{text[0..truncate_after_chars]}..." : text
+      (truncate_after_chars && text.size > truncate_after_chars) ? "#{text[0..truncate_after_chars]}..." : text
     end
 
     def display_args(args, truncate_after_chars = 2000)
@@ -324,7 +332,7 @@ module Sidekiq
     end
 
     def pollable?
-      !(current_path == "" || current_path.starts_with?("metrics"))
+      !(current_path == "" || current_path.start_with?("metrics"))
     end
 
     def retry_or_delete_or_kill(job, params)

data/lib/sidekiq/web.rb

@@ -48,6 +48,10 @@ module Sidekiq
       end
       alias_method :tabs, :custom_tabs
 
+      def custom_job_info_rows
+        @custom_job_info_rows ||= []
+      end
+
       def locales
         @locales ||= LOCALES
       end

data/sidekiq.gemspec

@@ -22,29 +22,17 @@ Gem::Specification.new do |gem|
     "source_code_uri" => "https://github.com/mperham/sidekiq"
   }
 
-  gem.add_dependency "redis-client", ">= 0.9.0"
+  gem.add_dependency "redis-client", ">= 0.11.0"
   gem.add_dependency "connection_pool", ">= 2.3.0"
   gem.add_dependency "rack", ">= 2.2.4"
   gem.add_dependency "concurrent-ruby", "< 2"
   gem.post_install_message = <<~EOM
     
-    ####################################################
-    
-    
-      █████████  █████ ██████████   ██████████ █████   ████ █████    ██████       ██████████       █████
-     ███░░░░░███░░███ ░░███░░░░███ ░░███░░░░░█░░███   ███░ ░░███   ███░░░░███    ░███░░░░███     ███░░░███
-    ░███    ░░░  ░███  ░███   ░░███ ░███  █ ░  ░███  ███    ░███  ███    ░░███   ░░░    ███     ███   ░░███
-    ░░█████████  ░███  ░███    ░███ ░██████    ░███████     ░███ ░███     ░███         ███     ░███    ░███
-     ░░░░░░░░███ ░███  ░███    ░███ ░███░░█    ░███░░███    ░███ ░███   ██░███        ███      ░███    ░███
-     ███    ░███ ░███  ░███    ███  ░███ ░   █ ░███ ░░███   ░███ ░░███ ░░████        ███       ░░███   ███
-    ░░█████████  █████ ██████████   ██████████ █████ ░░████ █████ ░░░██████░██      ███      ██ ░░░█████░
-     ░░░░░░░░░  ░░░░░ ░░░░░░░░░░   ░░░░░░░░░░ ░░░░░   ░░░░ ░░░░░    ░░░░░░ ░░      ░░░      ░░    ░░░░░░
-    
+    Welcome to Sidekiq 7.0!
     
     1. Use `gem 'sidekiq', '<7'` in your Gemfile if you don't want this new version.
     2. Read the release notes at https://github.com/mperham/sidekiq/blob/main/docs/7.0-Upgrade.md
-    3. Search for open/closed issues at https://github.com/mperham/sidekiq/issues/
-    
-    ####################################################
+    3. If you have problems, search for open/closed issues at https://github.com/mperham/sidekiq/issues/
+
   EOM
 end

data/web/assets/javascripts/application.js

@@ -31,6 +31,7 @@ function addListeners() {
     node.addEventListener("click", addDataToggleListeners)
   })
 
+  addShiftClickListeners()
   updateFuzzyTimes();
   setLivePollFromUrl();
 
@@ -71,6 +72,23 @@ function addDataToggleListeners(event) {
   }
 }
 
+function addShiftClickListeners() {
+  let checkboxes = Array.from(document.querySelectorAll(".shift_clickable"));
+  let lastChecked = null;
+  checkboxes.forEach(checkbox => {
+    checkbox.addEventListener("click", (e) => {
+      if (e.shiftKey && lastChecked) {
+        let myIndex = checkboxes.indexOf(checkbox);
+        let lastIndex = checkboxes.indexOf(lastChecked);
+        let [min, max] = [myIndex, lastIndex].sort();
+        let newState = checkbox.checked;
+        checkboxes.slice(min, max).forEach(c => c.checked = newState);
+      }
+      lastChecked = checkbox;
+    });
+  });
+}
+
 function updateFuzzyTimes() {
   var locale = document.body.getAttribute("data-locale");
   var parts = locale.split('-');

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

@@ -72,6 +72,10 @@ table {
   background-color: #31708f;
 }
 
+.alert-warning {
+  background-color: #c47612;
+}
+
 a:link, a:active, a:hover, a:visited {
   color: #ddd;
 }

data/web/assets/stylesheets/application.css

@@ -676,8 +676,8 @@ div.interval-slider input {
 }
 
 .info-circle {
-  color: #ccc;
-  background-color: #000;
+  color: #333;
+  background-color: #ccc;
   border-radius: 50%;
   text-align: center;
   vertical-align: middle;

data/web/views/_job_info.erb

@@ -1,6 +1,6 @@
-<header>
+<div class="header-container">
   <h3><%= t('Job') %></h3>
-</header>
+</div>
 
 <div class="table_container">
   <table class="table table-bordered table-striped table-hover">
@@ -33,6 +33,14 @@
           <code><%= job.jid %></code>
         </td>
       </tr>
+      <% if job.bid %>
+      <tr>
+        <th>BID</th>
+        <td>
+          <a href="<%= root_path %>batches/<%= job.bid %>"><%= job.bid %>
+        </td>
+      </tr>
+      <% end %>
       <tr>
         <th><%= t('CreatedAt') %></th>
         <td><%= relative_time(job.created_at) %></td>
@@ -84,6 +92,14 @@
           <td><%= relative_time(job.at) if job['retry_count'] %></td>
         </tr>
       <% end %>
+      <% Sidekiq::Web.custom_job_info_rows.each do |helper| %>
+        <% helper.add_pair(job) do |name, value| %>
+          <tr>
+            <th><%= name %></th>
+            <td><%= value %></td>
+          </tr>
+        <% end %>
+      <% end %>
     </tbody>
   </table>
 </div>

data/web/views/_paging.erb

@@ -1,3 +1,4 @@
+<div>
 <% if @total_size > @count %>
   <ul class="pagination pull-right flip">
     <li class="<%= 'disabled' if @current_page == 1 %>">
@@ -21,3 +22,4 @@
     </li>
   </ul>
 <% end %>
+</div>

data/web/views/busy.erb

@@ -1,7 +1,5 @@
-<div class="row header">
-  <div class="col-sm-4 pull-left flip">
-    <h3><%= t('Status') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('Status') %></h1>
 </div>
 
 <div class="stats-wrapper">
@@ -29,11 +27,9 @@
   </div>
 </div>
 
-<div class="row header">
-  <div class="col-sm-4 pull-left flip">
-    <h3><%= t('Processes') %></h3>
-  </div>
-  <div class="col-sm-3 pull-right flip">
+<div class="header-container">
+  <h1><%= t('Processes') %></h1>
+  <div>
     <form method="POST" class="warning-messages">
       <%= csrf_tag %>
       <div class="btn-group pull-right flip">
@@ -43,6 +39,7 @@
     </form>
   </div>
 </div>
+
 <div class="table_container">
   <table class="processes table table-hover table-bordered table-striped">
     <thead>
@@ -62,6 +59,9 @@
           <% process.labels.each do |label| %>
             <span class="label label-info"><%= label %></span>
           <% end %>
+          <% if process.embedded? %>
+            <span class="label label-default">embedded</span>
+          <% end %>
           <% if process.stopping? %>
             <span class="label label-danger">quiet</span>
           <% end %>
@@ -70,36 +70,47 @@
           <% end %>
           <br>
           <b><%= "#{t('Queues')}: " %></b>
-          <%= process.queues.join(", ") %>
+          <% if process.weights %>
+            <%= busy_weights(process.weights) %>
+          <% else %>
+            <%= process.queues.sort.join(", ") %>
+          <% end %>
+          <% if process.version != Sidekiq::VERSION %>
+            <br>
+            <b><%= "#{t('Version')}: " %></b>
+            <% if process.version %>
+              <%= process.version %>
+            <% else %>
+              <%= t('Unknown') %>
+            <% end %>
+          <% end %>
         </td>
         <td><%= relative_time(Time.at(process['started_at'])) %></td>
         <td><%= format_memory(process['rss'].to_i) %></td>
         <td><%= process['concurrency'] %></td>
         <td><%= process['busy'] %></td>
         <td>
-          <form method="POST">
-            <%= csrf_tag %>
-            <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
+          <% unless process.embedded? %>
+            <form method="POST">
+              <%= csrf_tag %>
+              <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
 
-            <div class="btn-group pull-right flip">
-              <% unless process.stopping? %><button class="btn btn-xs btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
-              <button class="btn btn-xs btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
-            </div>
-          </form>
+              <div class="btn-group pull-right flip">
+                <% unless process.stopping? %><button class="btn btn-xs btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
+                <button class="btn btn-xs btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
+              </div>
+            </form>
+          <% end %>
         </td>
       </tr>
     <% end %>
   </table>
 </div>
 
-<div class="row header">
-  <div class="col-sm-7">
-    <h3><%= t('Jobs') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('Jobs') %></h1>
   <% if @workset.size > 0 && @total_size > @count %>
-    <div class="col-sm-4">
-      <%= erb :_paging, locals: { url: "#{root_path}busy" } %>
-    </div>
+    <%= erb :_paging, locals: { url: "#{root_path}busy" } %>
   <% end %>
 </div>
 

data/web/views/metrics_for_job.erb

@@ -16,7 +16,7 @@
 <% if job_result.totals["s"] > 0 %>
   <div class="header-container">
     <h1>
-      <a href="<%= root_path %>metrics"><%= t(:metrics).to_s.titleize %></a> /
+      <a href="<%= root_path %>metrics"><%= t('Metrics') %></a> /
       <%= h @name %>
     </h1>
 
@@ -61,7 +61,7 @@
   <p><small>Data from <%= @query_result.starts_at %> to <%= @query_result.ends_at %></small></p>
 <% else %>
   <h1>
-    <a href="<%= root_path %>/metrics"><%= t(:metrics).to_s.titleize %></a> /
+    <a href="<%= root_path %>/metrics"><%= t('Metrics') %></a> /
     <%= h @name %>
   </h1>
 

data/web/views/morgue.erb

@@ -1,14 +1,10 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3><%= t('DeadJobs') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('DeadJobs') %></h1>
   <% if @dead.size > 0 && @total_size > @count %>
-    <div class="col-sm-4">
-      <%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
-    </div>
+    <%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
   <% end %>
   <%= filtering('dead') %>
-</header>
+</div>
 
 <% if @dead.size > 0 %>
   <form action="<%= root_path %>morgue" method="post">
@@ -33,7 +29,7 @@
           <tr>
             <td class="table-checkbox">
               <label>
-                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
+                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
               </label>
             </td>
             <td>

data/web/views/queue.erb

@@ -1,17 +1,13 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3>
-      <%= t('CurrentMessagesInQueue', :queue => h(@name)) %>
-      <% if @queue.paused? %>
-        <span class="label label-danger"><%= t('Paused') %></span>
-      <% end %>
-      <span class="badge badge-secondary"><%= number_with_delimiter(@total_size) %></span>
-    </h3>
-  </div>
-  <div class="col-sm-4 pull-right flip">
-    <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
-  </div>
-</header>
+<div class="header-container">
+  <h1><%= t('CurrentMessagesInQueue', :queue => h(@name)) %>
+    <% if @queue.paused? %>
+      <span class="label label-danger"><%= t('Paused') %></span>
+    <% end %>
+    <span class="badge badge-secondary"><%= number_with_delimiter(@total_size) %></span>
+  </h1>
+  <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
+</div>
+
 <div class="table_container">
   <table class="queue table table-hover table-bordered table-striped">
     <thead>

data/web/views/queues.erb

@@ -1,4 +1,6 @@
-<h3><%= t('Queues') %></h3>
+<div class="header-container">
+  <h1><%= t('Queues') %></h1>
+</div>
 
 <div class="table_container">
   <table class="queues table table-hover table-bordered table-striped">

data/web/views/retries.erb

@@ -1,14 +1,10 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3><%= t('Retries') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('Retries') %></h1>
   <% if @retries.size > 0 && @total_size > @count %>
-    <div class="col-sm-4">
-      <%= erb :_paging, locals: { url: "#{root_path}retries" } %>
-    </div>
+    <%= erb :_paging, locals: { url: "#{root_path}retries" } %>
   <% end %>
   <%= filtering('retries') %>
-</header>
+</div>
 
 <% if @retries.size > 0 %>
   <form action="<%= root_path %>retries" method="post">
@@ -34,7 +30,7 @@
           <tr>
             <td class="table-checkbox">
               <label>
-                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
+                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
               </label>
             </td>
             <td>

data/web/views/scheduled.erb

@@ -1,25 +1,22 @@
-<header class="row">
-  <div class="col-sm-5">
-    <h3><%= t('ScheduledJobs') %></h3>
-  </div>
+<div class="header-container">
+  <h1><%= t('ScheduledJobs') %></h1>
   <% if @scheduled.size > 0 && @total_size > @count %>
-    <div class="col-sm-4">
-      <%= erb :_paging, locals: { url: "#{root_path}scheduled" } %>
-    </div>
+    <%= erb :_paging, locals: { url: "#{root_path}scheduled" } %>
   <% end %>
   <%= filtering('scheduled') %>
-</header>
+</div>
 
 <% if @scheduled.size > 0 %>
-
   <form action="<%= root_path %>scheduled" method="post">
     <%= csrf_tag %>
     <div class="table_container">
       <table class="table table-striped table-bordered table-hover">
         <thead>
           <tr>
-            <th class="checkbox-column">
-              <input type="checkbox" class="check_all" />
+            <th class="table-checkbox checkbox-column">
+              <label>
+                <input type="checkbox" class="check_all" />
+              </label>
             </th>
             <th><%= t('When') %></th>
             <th><%= t('Queue') %></th>
@@ -29,8 +26,10 @@
         </thead>
         <% @scheduled.each do |entry| %>
           <tr>
-            <td>
-              <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
+            <td class="table-checkbox">
+              <label>
+                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' class='shift_clickable' />
+              </label>
             </td>
             <td>
                <a href="<%= root_path %>scheduled/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.3
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2023-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -204,26 +204,14 @@ metadata:
   documentation_uri: https://github.com/mperham/sidekiq/wiki
   changelog_uri: https://github.com/mperham/sidekiq/blob/main/Changes.md
   source_code_uri: https://github.com/mperham/sidekiq
-post_install_message: |2
-
-  ####################################################
-
-
-    █████████  █████ ██████████   ██████████ █████   ████ █████    ██████       ██████████       █████
-   ███░░░░░███░░███ ░░███░░░░███ ░░███░░░░░█░░███   ███░ ░░███   ███░░░░███    ░███░░░░███     ███░░░███
-  ░███    ░░░  ░███  ░███   ░░███ ░███  █ ░  ░███  ███    ░███  ███    ░░███   ░░░    ███     ███   ░░███
-  ░░█████████  ░███  ░███    ░███ ░██████    ░███████     ░███ ░███     ░███         ███     ░███    ░███
-   ░░░░░░░░███ ░███  ░███    ░███ ░███░░█    ░███░░███    ░███ ░███   ██░███        ███      ░███    ░███
-   ███    ░███ ░███  ░███    ███  ░███ ░   █ ░███ ░░███   ░███ ░░███ ░░████        ███       ░░███   ███
-  ░░█████████  █████ ██████████   ██████████ █████ ░░████ █████ ░░░██████░██      ███      ██ ░░░█████░
-   ░░░░░░░░░  ░░░░░ ░░░░░░░░░░   ░░░░░░░░░░ ░░░░░   ░░░░ ░░░░░    ░░░░░░ ░░      ░░░      ░░    ░░░░░░
+post_install_message: |2+
 
+  Welcome to Sidekiq 7.0!
 
   1. Use `gem 'sidekiq', '<7'` in your Gemfile if you don't want this new version.
   2. Read the release notes at https://github.com/mperham/sidekiq/blob/main/docs/7.0-Upgrade.md
-  3. Search for open/closed issues at https://github.com/mperham/sidekiq/issues/
+  3. If you have problems, search for open/closed issues at https://github.com/mperham/sidekiq/issues/
 
-  ####################################################
 rdoc_options: []
 require_paths:
 - lib
@@ -243,3 +231,4 @@ signing_key:
 specification_version: 4
 summary: Simple, efficient background processing for Ruby
 test_files: []
+...