sidekiq 5.2.10 → 6.5.12

data/web/views/morgue.erb

@@ -14,7 +14,7 @@
   <form action="<%= root_path %>morgue" method="post">
     <%= csrf_tag %>
     <div class="table_container">
-      <table class="table table-striped table-bordered table-white">
+      <table class="table table-striped table-bordered table-hover">
         <thead>
           <tr>
             <th class="table-checkbox checkbox-column">
@@ -42,7 +42,10 @@
             <td>
               <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
             </td>
-            <td><%= entry.display_class %></td>
+            <td>
+              <%= entry.display_class %>
+              <%= display_tags(entry, "dead") %>
+            </td>
             <td>
               <div class="args"><%= display_args(entry.display_args) %></div>
             </td>
@@ -55,18 +58,18 @@
         <% end %>
       </table>
     </div>
-    <input class="btn btn-primary btn-xs pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger btn-xs pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
+    <input class="btn btn-primary pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
+    <input class="btn btn-danger pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
   </form>
 
   <% unfiltered? do %>
     <form action="<%= root_path %>morgue/all/delete" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
     </form>
     <form action="<%= root_path %>morgue/all/retry" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <input class="btn btn-danger pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
     </form>
   <% end %>
 

data/web/views/queue.erb

@@ -15,27 +15,40 @@
 <div class="table_container">
   <table class="queue table table-hover table-bordered table-striped">
     <thead>
+      <th><a href="<%= url %>?direction=<%= params[:direction] == 'asc' ? 'desc' : 'asc' %>"># <%= sort_direction_label %></a></th>
       <th><%= t('Job') %></th>
       <th><%= t('Arguments') %></th>
+      <th><%= t('Context') %></th>
       <th></th>
     </thead>
-    <% @messages.each_with_index do |msg, index| %>
-      <tr>
-        <td><%= h(msg.display_class) %></td>
+    <% @jobs.each_with_index do |job, index| %>
+      <tr title="<%= job.jid %>">
+        <% if params[:direction] == 'asc' %>
+          <td><%= @count * (@current_page - 1) + index + 1 %></td>
+        <% else %>
+          <td><%= @total_size - (@count * (@current_page - 1) + index) %></td>
+        <% end %>
         <td>
-          <% a = msg.display_args %>
+          <%= h(job.display_class) %>
+          <%= display_tags(job, nil) %>
+        </td>
+        <td>
+          <% a = job.display_args %>
           <% if a.inspect.size > 100 %>
-            <span class="worker_<%= index %>"><%= h(a.inspect[0..100]) + "... " %></span>
-            <button data-toggle="collapse" data-target=".worker_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
-            <div class="toggle worker_<%= index %>"><%= display_args(a) %></div>
+            <span id="job_<%= index %>"><%= h(a.inspect[0..100]) + "... " %></span>
+            <button data-toggle="job_<%= index %>_full" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
+            <div class="toggle" id="job_<%= index %>_full"><%= display_args(a) %></div>
           <% else %>
-            <%= display_args(msg.display_args) %>
+            <%= display_args(job.display_args) %>
           <% end %>
         </td>
+        <td>
+          <%= h(job["cattr"].inspect) if job["cattr"]&.any? %>
+        </td>
         <td>
           <form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
             <%= csrf_tag %>
-            <input name="key_val" value="<%= h msg.value %>" type="hidden" />
+            <input name="key_val" value="<%= h job.value %>" type="hidden" />
             <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
           </form>
         </td>
@@ -43,4 +56,4 @@
     <% end %>
   </table>
 </div>
-<%= erb :_paging, locals: { url: "#{root_path}queues/#{@name}" } %>
+<%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>

data/web/views/queues.erb

@@ -1,7 +1,7 @@
 <h3><%= t('Queues') %></h3>
 
 <div class="table_container">
-  <table class="queues table table-hover table-bordered table-striped table-white">
+  <table class="queues table table-hover table-bordered table-striped">
     <thead>
       <th><%= t('Queue') %></th>
       <th><%= t('Size') %></th>
@@ -21,7 +21,15 @@
         <td class="delete-confirm">
           <form action="<%=root_path %>queues/<%= CGI.escape(queue.name) %>" method="post">
             <%= csrf_tag %>
-            <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
+            <input class="btn btn-danger" type="submit" name="delete" title="This will delete all jobs within the queue, it will reappear if you push more jobs to it in the future." value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSureDeleteQueue', :queue => h(queue.name)) %>" />
+
+            <% if Sidekiq.pro? %>
+              <% if queue.paused? %>
+                <input class="btn btn-danger" type="submit" name="unpause" value="<%= t('Unpause') %>" />
+              <% else %>
+                <input class="btn btn-danger" type="submit" name="pause" value="<%= t('Pause') %>" />
+              <% end %>
+            <% end %>
           </form>
         </td>
       </tr>

data/web/views/retries.erb

@@ -14,7 +14,7 @@
   <form action="<%= root_path %>retries" method="post">
     <%= csrf_tag %>
     <div class="table_container">
-      <table class="table table-striped table-bordered table-white">
+      <table class="table table-striped table-bordered table-hover">
         <thead>
           <tr>
             <th class="table-checkbox checkbox-column">
@@ -44,7 +44,10 @@
             <td>
               <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
             </td>
-            <td><%= entry.display_class %></td>
+            <td>
+              <%= entry.display_class %>
+              <%= display_tags(entry, "retries") %>
+            </td>
             <td>
               <div class="args"><%= display_args(entry.display_args) %></div>
             </td>
@@ -55,23 +58,23 @@
         <% end %>
       </table>
     </div>
-    <input class="btn btn-primary btn-xs pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger btn-xs pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
-    <input class="btn btn-danger btn-xs pull-left flip" type="submit" name="kill" value="<%= t('Kill') %>" />
+    <input class="btn btn-primary pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
+    <input class="btn btn-danger pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
+    <input class="btn btn-danger pull-left flip" type="submit" name="kill" value="<%= t('Kill') %>" />
   </form>
 
   <% unfiltered? do %>
     <form action="<%= root_path %>retries/all/delete" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSure') %>" />
     </form>
     <form action="<%= root_path %>retries/all/retry" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <input class="btn btn-danger pull-right flip" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
     </form>
     <form action="<%= root_path %>retries/all/kill" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger btn-xs pull-right flip" type="submit" name="kill" value="<%= t('KillAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <input class="btn btn-danger pull-right flip" type="submit" name="kill" value="<%= t('KillAll') %>" data-confirm="<%= t('AreYouSure') %>" />
     </form>
   <% end %>
 

data/web/views/retry.erb

@@ -2,7 +2,7 @@
 
 <h3><%= t('Error') %></h3>
 <div class="table_container">
-  <table class="error table table-bordered table-striped">
+  <table class="error table table-bordered table-striped table-hover">
     <tbody>
       <tr>
         <th><%= t('ErrorClass') %></th>
@@ -14,11 +14,11 @@
         <th><%= t('ErrorMessage') %></th>
         <td><%= h(@retry['error_message']) %></td>
       </tr>
-      <% if !@retry['error_backtrace'].nil? %>
+      <% if @retry.error_backtrace %>
         <tr>
           <th><%= t('ErrorBacktrace') %></th>
           <td>
-            <code><%= @retry['error_backtrace'].join("<br/>") %></code>
+            <code><%= @retry.error_backtrace.join("<br/>") %></code>
           </td>
         </tr>
       <% end %>

data/web/views/scheduled.erb

@@ -15,7 +15,7 @@
   <form action="<%= root_path %>scheduled" method="post">
     <%= csrf_tag %>
     <div class="table_container">
-      <table class="table table-striped table-bordered table-white">
+      <table class="table table-striped table-bordered table-hover">
         <thead>
           <tr>
             <th class="checkbox-column">
@@ -38,7 +38,10 @@
             <td>
               <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
             </td>
-            <td><%= entry.display_class %></td>
+            <td>
+              <%= entry.display_class %>
+              <%= display_tags(entry, "scheduled") %>
+            </td>
             <td>
                <div class="args"><%= display_args(entry.display_args) %></div>
             </td>

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 5.2.10
+  version: 6.5.12
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: '5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: '5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -64,98 +64,84 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rack-protection
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 description: Simple, efficient background processing for Ruby.
 email:
 - mperham@gmail.com
 executables:
 - sidekiq
-- sidekiqctl
+- sidekiqmon
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".github/contributing.md"
-- ".github/issue_template.md"
-- ".gitignore"
-- ".travis.yml"
-- 3.0-Upgrade.md
-- 4.0-Upgrade.md
-- 5.0-Upgrade.md
-- COMM-LICENSE
 - Changes.md
-- Ent-Changes.md
-- Gemfile
 - LICENSE
-- Pro-2.0-Upgrade.md
-- Pro-3.0-Upgrade.md
-- Pro-4.0-Upgrade.md
-- Pro-Changes.md
 - README.md
-- Rakefile
 - bin/sidekiq
-- bin/sidekiqctl
 - bin/sidekiqload
-- code_of_conduct.md
-- 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
+- bin/sidekiqmon
+- 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
 - lib/sidekiq/client.rb
-- lib/sidekiq/core_ext.rb
-- lib/sidekiq/ctl.rb
+- lib/sidekiq/component.rb
 - lib/sidekiq/delay.rb
-- lib/sidekiq/exception_handler.rb
 - lib/sidekiq/extensions/action_mailer.rb
 - lib/sidekiq/extensions/active_record.rb
 - lib/sidekiq/extensions/class_methods.rb
 - lib/sidekiq/extensions/generic_proxy.rb
 - lib/sidekiq/fetch.rb
+- 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/logging.rb
+- lib/sidekiq/logger.rb
 - lib/sidekiq/manager.rb
+- lib/sidekiq/metrics/deploy.rb
+- lib/sidekiq/metrics/query.rb
+- lib/sidekiq/metrics/shared.rb
+- lib/sidekiq/metrics/tracking.rb
 - lib/sidekiq/middleware/chain.rb
+- lib/sidekiq/middleware/current_attributes.rb
 - lib/sidekiq/middleware/i18n.rb
-- lib/sidekiq/middleware/server/active_record.rb
+- lib/sidekiq/middleware/modules.rb
+- lib/sidekiq/monitor.rb
 - lib/sidekiq/paginator.rb
 - lib/sidekiq/processor.rb
 - lib/sidekiq/rails.rb
+- lib/sidekiq/redis_client_adapter.rb
 - lib/sidekiq/redis_connection.rb
+- lib/sidekiq/ring_buffer.rb
 - lib/sidekiq/scheduled.rb
+- lib/sidekiq/sd_notify.rb
+- lib/sidekiq/systemd.rb
 - lib/sidekiq/testing.rb
 - lib/sidekiq/testing/inline.rb
-- lib/sidekiq/util.rb
+- lib/sidekiq/transaction_aware_client.rb
 - lib/sidekiq/version.rb
 - lib/sidekiq/web.rb
 - lib/sidekiq/web/action.rb
 - lib/sidekiq/web/application.rb
+- lib/sidekiq/web/csrf_protection.rb
 - lib/sidekiq/web/helpers.rb
 - lib/sidekiq/web/router.rb
 - lib/sidekiq/worker.rb
 - sidekiq.gemspec
+- web/assets/images/apple-touch-icon.png
 - web/assets/images/favicon.ico
 - web/assets/images/logo.png
 - web/assets/images/status.png
 - web/assets/javascripts/application.js
+- web/assets/javascripts/chart.min.js
+- web/assets/javascripts/chartjs-plugin-annotation.min.js
 - web/assets/javascripts/dashboard.js
+- web/assets/javascripts/graph.js
+- web/assets/javascripts/metrics.js
+- web/assets/stylesheets/application-dark.css
 - web/assets/stylesheets/application-rtl.css
 - web/assets/stylesheets/application.css
 - web/assets/stylesheets/bootstrap-rtl.min.css
@@ -174,6 +160,7 @@ files:
 - web/locales/it.yml
 - web/locales/ja.yml
 - web/locales/ko.yml
+- web/locales/lt.yml
 - web/locales/nb.yml
 - web/locales/nl.yml
 - web/locales/pl.yml
@@ -184,6 +171,7 @@ files:
 - web/locales/ta.yml
 - web/locales/uk.yml
 - web/locales/ur.yml
+- web/locales/vi.yml
 - web/locales/zh-cn.yml
 - web/locales/zh-tw.yml
 - web/views/_footer.erb
@@ -197,6 +185,8 @@ files:
 - web/views/dashboard.erb
 - web/views/dead.erb
 - web/views/layout.erb
+- web/views/metrics.erb
+- web/views/metrics_for_job.erb
 - web/views/morgue.erb
 - web/views/queue.erb
 - web/views/queues.erb
@@ -204,10 +194,15 @@ files:
 - web/views/retry.erb
 - web/views/scheduled.erb
 - web/views/scheduled_job_info.erb
-homepage: http://sidekiq.org
+homepage: https://sidekiq.org
 licenses:
 - LGPL-3.0
-metadata: {}
+metadata:
+  homepage_uri: https://sidekiq.org
+  bug_tracker_uri: https://github.com/mperham/sidekiq/issues
+  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:
 rdoc_options: []
 require_paths:
@@ -216,14 +211,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Simple, efficient background processing for Ruby

data/.circleci/config.yml

@@ -1,61 +0,0 @@
-version: 2
-references:
-  unit: &unit
-    run:
-      name: Run test suite
-      command: bundle exec rake
-  restore: &restore
-    restore_cache:
-      keys:
-        - v1-dependencies-{{ checksum "Gemfile.lock" }}
-        # fallback to using the latest cache if no exact match is found
-        - v1-dependencies-
-  bundle: &bundle
-    run:
-      name: install dependencies
-      command: |
-        bundle install --jobs=4 --retry=3 --path vendor/bundle
-  save: &save
-    save_cache:
-      paths:
-        - ./vendor/bundle
-      key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-jobs:
-  "ruby-2.5":
-    docker:
-      - image: circleci/ruby:2.5
-      - image: circleci/redis:4.0
-    steps:
-      - checkout
-      - <<: *restore
-      - <<: *bundle
-      - <<: *save
-      - <<: *unit
-  "ruby-2.6":
-    docker:
-      - image: circleci/ruby:2.6
-      - image: circleci/redis:4.0
-    steps:
-      - checkout
-      - <<: *restore
-      - <<: *bundle
-      - <<: *save
-      - <<: *unit
-  "jruby":
-    docker:
-      - image: circleci/jruby:latest
-      - image: circleci/redis:4.0
-    steps:
-      - checkout
-      - <<: *restore
-      - <<: *bundle
-      - <<: *save
-      - <<: *unit
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - "ruby-2.5"
-      - "ruby-2.6"
-      - "jruby"

data/.github/contributing.md

@@ -1,32 +0,0 @@
-# Contributing
-
-## Issues
-
-When opening an issue:
-
-* include the full **backtrace** with your error
-* include your Sidekiq initializer
-* list versions you are using: Ruby, Rails, Sidekiq, OS, etc.
-
-It's always better to include more info rather than less.
-
-## Code
-
-It's always best to open an issue before investing a lot of time into a
-fix or new functionality.  Functionality must meet my design goals and
-vision for the project to be accepted; I would be happy to discuss how
-your idea can best fit into Sidekiq.
-
-## Legal
-
-By submitting a Pull Request, you disavow any rights or claims to any changes
-submitted to the Sidekiq project and assign the copyright of
-those changes to Contributed Systems LLC.
-
-If you cannot or do not want to reassign those rights (your employment
-contract for your employer may not allow this), you should not submit a PR.
-Open an issue and someone else can do the work.
-
-This is a legal way of saying "If you submit a PR to us, that code becomes ours".
-99.9% of the time that's what you intend anyways; we hope it doesn't scare you
-away from contributing.

data/.github/issue_template.md

@@ -1,11 +0,0 @@
-Ruby version:
-Sidekiq / Pro / Enterprise version(s):
-
-Please include your initializer and any error message with the full backtrace.
-
-Are you using an old version?
-Have you checked the changelogs to see if your issue has been fixed in a later version?
-
-https://github.com/mperham/sidekiq/blob/master/Changes.md
-https://github.com/mperham/sidekiq/blob/master/Pro-Changes.md
-https://github.com/mperham/sidekiq/blob/master/Ent-Changes.md

data/.gitignore

@@ -1,15 +0,0 @@
-.rvmrc
-.ruby-version
-tags
-Gemfile.lock
-gemfiles/*.lock
-*.swp
-dump.rdb
-.rbx
-coverage/
-vendor/
-.bundle/
-.sass-cache/
-tmp/
-pkg/*.gem
-.byebug_history

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-services:
-  - redis-server
-rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - 2.6.0
-  - jruby-9.2.6.0