sidekiq 8.1.5 → 8.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11298be12e389dc2bc8c9f722b5bdff096650fae86bb8a234d506db413c93144
-  data.tar.gz: 17c1713a8c54977b1de6b0de2e1399d0edd97c3c682a75b35dcb16411e2a21b8
+  metadata.gz: 1e36b05d6e25f174a0ff8b8a21b4c097a108e4ccf98af88a56ae767cfea1186a
+  data.tar.gz: c58b4f89a1466bac6c9de05cf5ea2aee0152ac42184946b4d1646c6938b351a8
 SHA512:
-  metadata.gz: 7eae0c8716939b3eb127163df6aedbd5ca794ef23d3ec884cc8a7d790352318a1f5501b2f2b6ebb711a810cfaa6b5488541515e7192383f0e7b37681fe5f8bac
-  data.tar.gz: d40a3594074bc5184a7de2fd63899607e6adee7fdf1d8ebf53058411e69029d63fa010c0eef6edab44902746f56bdcfe4b06aade7118d9bb450ab1dd48ed4833
+  metadata.gz: 3b8690078001bb93fc6e4fb8fe4d52091d89c317d8dcef56d24247882f4c85dbe986a05ae5451aaf70b9ff25c4acbc89b2d15e909763550bbcb13f36e73b2f7f
+  data.tar.gz: 3cabd5a3a2861af5faf70c5f67d8eb93c578d58cb7825dc063e350f30ef37dc3e2c51060a58dcf2fca9915df1bb7fcbfd00d81996ba651c29882c8432545b03a

data/Changes.md

@@ -2,9 +2,18 @@
 
 [Sidekiq Changes](https://github.com/sidekiq/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/sidekiq/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/sidekiq/sidekiq/blob/main/Ent-Changes.md)
 
+8.1.6
+----------
+
+- Fix reported thread/memory leak when jobs fail [#7006]
+- Users can limit data displayed on Busy page with the `only` parameter `/busy?only=(jobs|processes)` [#6992]
+- Replace Rack::Utils usage with standard library APIs
+- Several minor fixes from AI scanners.
+
 8.1.5
 ----------
 
+- Fix sub-second precision when computing the `retry_for` deadline [#7003]
 - Identify Sidekiq connnections in Redis with `CLIENT SETINFO` [#6986]
 - Fix edge case where Web UI could show an empty Batch set [#6987]
 
@@ -47,6 +56,7 @@ Use REDIS_URL or REDIS_PROVIDER to point `kiq` to Redis.
 require "sidekiq/testing"
 require "sidekiq/testing/inline"
 # New, more explicit
+require "sidekiq"
 Sidekiq.testing!(:fake)
 Sidekiq.testing!(:inline)
 ```

data/lib/sidekiq/config.rb

@@ -297,15 +297,11 @@ module Sidekiq
       @logger = logger
     end
 
-    private def parameter_size(handler)
-      target = handler.is_a?(Proc) ? handler : handler.method(:call)
-      target.parameters.size
-    end
-
     # INTERNAL USE ONLY
     def handle_exception(ex, ctx = {})
-      if @options[:error_handlers].size == 0
-        p ["!!!!!", ex]
+      if @options[:error_handlers].empty?
+        logger.error { "No error handlers configured, logging exception directly" }
+        logger.error { ex }
       end
       @options[:error_handlers].each do |handler|
         handler.call(ex, ctx, self)

data/lib/sidekiq/job.rb

@@ -196,7 +196,7 @@ module Sidekiq
 
       def set(options)
         hash = options.transform_keys(&:to_s)
-        interval = hash.delete("wait_until") || @opts.delete("wait")
+        interval = hash.delete("wait_until") || hash.delete("wait")
         @opts.merge!(hash)
         at(interval) if interval
         self

data/lib/sidekiq/job_retry.rb

@@ -211,7 +211,7 @@ module Sidekiq
       if item.is_a?(Float)
         Time.at(item)
       else
-        Time.at(item / 1000, item % 1000)
+        Time.at(item / 1000, item % 1000, :millisecond)
       end
     end
 

data/lib/sidekiq/manager.rb

@@ -75,6 +75,7 @@ module Sidekiq
           p.start
         end
       end
+      nil
     end
 
     def stopped?

data/lib/sidekiq/redis_client_adapter.rb

@@ -41,8 +41,8 @@ module Sidekiq
       # this allows us to use methods like `conn.hmset(...)` instead of having to use
       # redis-client's native `conn.call("hmset", ...)`
       def method_missing(*args, &block)
-        warn("[sidekiq#5788] Redis has deprecated the `#{args.first}`command, called at #{caller(1..1)}") if DEPRECATED_COMMANDS.include?(args.first)
-        @client.call(*args, *block)
+        warn("[sidekiq#5788] Redis has deprecated the `#{args.first}` command, called at #{caller(1..1)}") if DEPRECATED_COMMANDS.include?(args.first)
+        @client.call(*args, &block)
       end
       ruby2_keywords :method_missing if respond_to?(:ruby2_keywords, true)
 

data/lib/sidekiq/testing.rb

@@ -1,2 +1,3 @@
+require "sidekiq"
 Sidekiq.testing!(:fake)
 warn('⛔️ `require "sidekiq/testing"` is deprecated and will be removed in Sidekiq 9.0. See https://sidekiq.org/wiki/Testing#new-api')

data/lib/sidekiq/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "8.1.5"
+  VERSION = "8.1.6"
   MAJOR = 8
 
   def self.gem_version

data/lib/sidekiq/web/action.rb

@@ -24,8 +24,8 @@ module Sidekiq
         @request ||= ::Rack::Request.new(env)
       end
 
-      def halt(res)
-        throw :halt, [res, {"content-type" => "text/plain"}, [res.to_s]]
+      def halt(res, msg = nil)
+        throw :halt, [res, {"content-type" => "text/plain"}, [msg || res.to_s]]
       end
 
       # external redirect

data/lib/sidekiq/web/application.rb

@@ -90,9 +90,18 @@ module Sidekiq
 
       get "/busy" do
         @count = (url_params("count") || 100).to_i
-        (@current_page, @total_size, @workset) = page_items(workset, url_params("page"), @count)
 
-        @iterable_states = Sidekiq::IterableJobQuery.new(workset.map { |_, _, work| work.job.jid })
+        # Use /busy?only=(jobs|processes) to limit page data
+        only = url_params("only")
+        halt 401, "Invalid value for only" unless only.nil? || only == "jobs" || only == "processes"
+
+        @show_jobs = (only != "processes")
+        @show_processes = (only != "jobs")
+
+        if @show_jobs
+          (@current_page, @total_size, @workset) = page_items(workset, url_params("page"), @count)
+          @iterable_states = Sidekiq::IterableJobQuery.new(workset.map { |_, _, work| work.job.jid })
+        end
 
         erb(:busy)
       end

data/lib/sidekiq/web/helpers.rb

@@ -72,19 +72,13 @@ module Sidekiq
       # so extensions can be localized
       @@strings[lang] ||= config.locales.each_with_object({}) do |path, global|
         find_locale_files(lang).each do |file|
-          strs = parse_yaml_new(file)
+          strs = parse_yaml(file)
           global.merge!(strs[lang])
         end
       end
     end
 
-    # TODO Remove
-    def parse_yaml_old(path)
-      require "yaml"
-      YAML.safe_load_file(path)
-    end
-
-    def parse_yaml_new(path)
+    def parse_yaml(path)
       locale = nil
       map = {}
       IO.readlines(path, chomp: true).each do |line|
@@ -156,17 +150,18 @@ module Sidekiq
       erb(:filtering, locals: {which:, placeholder_key:, label_key:})
     end
 
-    def filter_link(jid, within = "retries")
+    def filter_link(str, within = "retries")
+      hstr = h(str)
       if within.nil?
-        ::Rack::Utils.escape_html(jid)
+        hstr
       else
-        "<a href='#{root_path}#{within}?substr=#{jid}'>#{::Rack::Utils.escape_html(jid)}</a>"
+        "<a href='#{root_path}#{within}?substr=#{hstr}'>#{hstr}</a>"
       end
     end
 
     def display_tags(job, within = "retries")
       job.tags.map { |tag|
-        "<span class='label label-info jobtag jobtag-#{Rack::Utils.escape_html(tag)}'>#{filter_link(tag, within)}</span>"
+        "<span class='label label-info jobtag jobtag-#{h(tag)}'>#{filter_link(tag, within)}</span>"
       }.join(" ")
     end
 
@@ -337,7 +332,7 @@ module Sidekiq
       [score.to_f, jid]
     end
 
-    SAFE_QPARAMS = %w[page direction]
+    SAFE_QPARAMS = %w[page direction only]
 
     # Merge options with current params, filter safe params, and stringify to query string
     def qparams(options)
@@ -420,7 +415,7 @@ module Sidekiq
     end
 
     def h(text)
-      ::Rack::Utils.escape_html(text.to_s)
+      ::CGI.escapeHTML(text.to_s)
     rescue ArgumentError => e
       raise unless e.message.eql?("invalid byte sequence in UTF-8")
       text.encode!("UTF-16", "UTF-8", invalid: :replace, replace: "").encode!("UTF-8", "UTF-16")

data/lib/sidekiq/web/router.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rack"
+require "uri"
 
 module Sidekiq
   class Web
@@ -28,7 +28,7 @@ module Sidekiq
 
       def match(env)
         request_method = env["REQUEST_METHOD"].downcase.to_sym
-        path_info = ::Rack::Utils.unescape_path env["PATH_INFO"]
+        path_info = ::URI::RFC2396_PARSER.unescape env["PATH_INFO"]
 
         # There are servers which send an empty string when requesting the root.
         # These servers should be ashamed of themselves.

data/web/views/busy.html.erb

@@ -27,6 +27,7 @@
   </div>
 </section>
 
+<% if @show_processes %>
 <section>
   <header>
     <h2><%= t('Processes') %></h2>
@@ -102,50 +103,53 @@
     </table>
   </div>
 </section>
+<% end %>
 
-<section>
-  <header>
-    <h2><%= t('Jobs') %></h2>
-    <% if @workset.size > 0 && @total_size > @count %>
-      <%= erb :_paging, locals: { url: "#{root_path}busy" } %>
-    <% end %>
-  </header>
-
-  <div class="table_container">
-    <table>
-      <thead>
-        <th><%= t('Process') %></th>
-        <th><%= t('TID') %></th>
-        <th><%= t('JID') %></th>
-        <th><%= t('Queue') %></th>
-        <th><%= t('Job') %></th>
-        <th><%= t('Arguments') %></th>
-        <th><%= t('Started') %></th>
-      </thead>
-      <% @workset.each do |process, thread, work| %>
-        <% job = work.job %>
-        <tr>
-          <td><%= process %></td>
-          <td><%= thread %></td>
-          <td><%= job.jid %></td>
-          <td>
-            <a href="<%= root_path %>queues/<%= work.queue %>"><%= work.queue %></a>
-          </td>
-          <td>
-            <%= job.display_class %>
-            <%= display_tags(job, nil) %>
-          </td>
-          <td>
-            <code><div class="args"><%= display_args(job.display_args) %></div></code>
-          </td>
-          <td>
-            <%= relative_time(work.run_at) %>
-            <% if (state = @iterable_states[job.jid]) %>
-              <div><small>cursor=<%= h(truncate(state.cursor.inspect, 100)) %>; exec=<%= state.executions %>; rt=<%= number_with_delimiter(state.runtime, precision: 3) %>s</small></div>
-            <% end %>
-          </td>
-        </tr>
+<% if @show_jobs %>
+  <section>
+    <header>
+      <h2><%= t('Jobs') %></h2>
+      <% if @workset.size > 0 && @total_size > @count %>
+        <%= erb :_paging, locals: { url: "#{root_path}busy" } %>
       <% end %>
-    </table>
-  </div>
-</section>
+    </header>
+
+    <div class="table_container">
+      <table>
+        <thead>
+          <th><%= t('Process') %></th>
+          <th><%= t('TID') %></th>
+          <th><%= t('JID') %></th>
+          <th><%= t('Queue') %></th>
+          <th><%= t('Job') %></th>
+          <th><%= t('Arguments') %></th>
+          <th><%= t('Started') %></th>
+        </thead>
+        <% @workset.each do |process, thread, work| %>
+          <% job = work.job %>
+          <tr>
+            <td><%= process %></td>
+            <td><%= thread %></td>
+            <td><%= job.jid %></td>
+            <td>
+              <a href="<%= root_path %>queues/<%= work.queue %>"><%= work.queue %></a>
+            </td>
+            <td>
+              <%= job.display_class %>
+              <%= display_tags(job, nil) %>
+            </td>
+            <td>
+              <code><div class="args"><%= display_args(job.display_args) %></div></code>
+            </td>
+            <td>
+              <%= relative_time(work.run_at) %>
+              <% if (state = @iterable_states[job.jid]) %>
+                <div><small>cursor=<%= h(truncate(state.cursor.inspect, 100)) %>; exec=<%= state.executions %>; rt=<%= number_with_delimiter(state.runtime, precision: 3) %>s</small></div>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </table>
+    </div>
+  </section>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 8.1.5
+  version: 8.1.6
 platform: ruby
 authors:
 - Mike Perham