sidekiq 4.2.10 → 6.5.7

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,19 +58,23 @@
         <% end %>
       </table>
     </div>
-    <input class="btn btn-primary btn-xs pull-left" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger btn-xs pull-left" type="submit" name="delete" value="<%= t('Delete') %>" />
-    <input class="btn btn-danger btn-xs pull-left" 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" 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" 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 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>
@@ -46,8 +49,8 @@
         <% end %>
       </table>
     </div>
-    <input class="btn btn-danger pull-right" type="submit" name="delete" value="<%= t('Delete') %>" />
-    <input class="btn btn-danger pull-right" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />
+    <input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('Delete') %>" />
+    <input class="btn btn-danger pull-right flip" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />
   </form>
 <% else %>
   <div class="alert alert-success"><%= t('NoScheduledFound') %></div>

metadata

@@ -1,296 +1,146 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.2.10
+  version: 6.5.7
 platform: ruby
 authors:
 - Mike Perham
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.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
-- !ruby/object:Gem::Dependency
-  name: redis-namespace
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: percy-capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 description: Simple, efficient background processing for Ruby.
 email:
 - mperham@gmail.com
 executables:
 - sidekiq
-- sidekiqctl
+- sidekiqmon
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/contributing.md"
-- ".github/issue_template.md"
-- ".gitignore"
-- ".travis.yml"
-- 3.0-Upgrade.md
-- 4.0-Upgrade.md
-- COMM-LICENSE
 - Changes.md
-- Ent-Changes.md
-- Gemfile
 - LICENSE
-- Pro-2.0-Upgrade.md
-- Pro-3.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/exception_handler.rb
+- lib/sidekiq/component.rb
+- lib/sidekiq/delay.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/server/logging.rb
-- lib/sidekiq/middleware/server/retry_jobs.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
 - web/assets/stylesheets/bootstrap.css
+- web/locales/ar.yml
 - web/locales/cs.yml
 - web/locales/da.yml
 - web/locales/de.yml
@@ -299,10 +149,12 @@ files:
 - web/locales/es.yml
 - web/locales/fa.yml
 - web/locales/fr.yml
+- web/locales/he.yml
 - web/locales/hi.yml
 - 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
@@ -312,6 +164,8 @@ files:
 - web/locales/sv.yml
 - 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
@@ -325,6 +179,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
@@ -332,11 +188,16 @@ 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: {}
-post_install_message: 
+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:
 - lib
@@ -344,16 +205,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Simple, efficient background processing for Ruby
 test_files: []

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,9 +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 changelog to see if your issue has been fixed in a later version?
-
-https://github.com/mperham/sidekiq/blob/master/Changes.md

data/.gitignore

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

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-services:
-  - redis-server
-before_install:
-  - gem install bundler
-  - gem update bundler
-matrix:
-  include:
-    - rvm: 2.2.4
-      env: "PERCY_ENABLE=0"
-    - rvm: 2.3.0
-      env: "PERCY_ENABLE=0"
-    - rvm: 2.4.0
-      env: "PERCY_ENABLE=1"
-    - rvm: jruby-9.1.6.0
-      env: "PERCY_ENABLE=0"

data/3.0-Upgrade.md

@@ -1,70 +0,0 @@
-# Upgrading to Sidekiq 3.0
-
-Sidekiq 3.0 brings several new features but also removes old APIs and
-changes a few data elements in Redis.  To upgrade cleanly:
-
-* Upgrade to the latest Sidekiq 2.x and run it for a few weeks.
-  `gem 'sidekiq', '< 3'`
-  This is only needed if you have retries pending.
-* 3rd party gems which use **client-side middleware** will need to update
-  due to an API change.  The Redis connection for a particular job is
-  passed thru the middleware to handle sharding where jobs can
-  be pushed to different redis server instances.
-
-  `def call(worker_class, msg, queue, redis_pool)`
-
-  Client-side middleware should use `redis_pool.with { |conn| ... }` to
-  perform Redis operations and **not** `Sidekiq.redis`.
-* If you used the capistrano integration, you'll need to pull in the
-  new [capistrano-sidekiq](https://github.com/seuros/capistrano-sidekiq)
-  gem and use it in your deploy.rb.
-* API changes:
-  - `Sidekiq::Client.registered_workers` replaced by `Sidekiq::Workers.new`
-  - `Sidekiq::Client.registered_queues` replaced by `Sidekiq::Queue.all`
-  - `Sidekiq::Worker#retries_exhausted` replaced by `Sidekiq::Worker.sidekiq_retries_exhausted`
-  - `Sidekiq::Workers#each` has changed significantly with a reworking
-    of Sidekiq's internal process/thread data model.
-* `sidekiq/api` is no longer automatically required.  If your code uses
-  the API, you will need to require it.
-* Redis-to-Go is no longer transparently activated on Heroku so as to not play
-  favorites with any particular Redis service. You need to set a config option
-  for your app:
-  `heroku config:set REDIS_PROVIDER=REDISTOGO_URL`.  You may also use 
-  the generic `REDIS_URL`.  See
-  [Advanced Options: Setting the Location of your Redis server][1]
-  for details.
-* Anyone using Airbrake, Honeybadger, Exceptional or ExceptionNotifier
-  will need to update their error gem version to the latest to pull in
-  Sidekiq support.  Sidekiq will not provide explicit support for these
-  services so as to not play favorites with any particular error service.
-* MRI 1.9 is no longer officially supported.  Sidekiq's official
-  support policy is to support the current and previous major releases
-  of MRI and Rails.  As of February 2014, that's MRI 2.1, MRI 2.0, JRuby 1.7, Rails 4.0
-  and Rails 3.2.  I will consider PRs to fix issues found by users for
-  other platforms/versions.
-
-## Error Service Providers
-
-If you previously provided a middleware to capture job errors, you
-should instead provide a global error handler with Sidekiq 3.0.  This
-ensures **any** error within Sidekiq will be logged appropriately, not
-just during job execution.
-
-```ruby
-if Sidekiq::VERSION < '3'
-  # old behavior
-  Sidekiq.configure_server do |config|
-    config.server_middleware do |chain|
-      chain.add MyErrorService::Middleware
-    end
-  end
-else
-  Sidekiq.configure_server do |config|
-    config.error_handlers << proc {|ex,context| MyErrorService.notify(ex, context) }
-  end
-end
-```
-
-Your error handler must respond to `call(exception, context_hash)`.
-
-[1]: https://github.com/mperham/sidekiq/wiki/Advanced-Options#via-env-variable