sidekiq 6.1.3 → 6.2.0

data/sidekiq.gemspec

@@ -9,11 +9,19 @@ Gem::Specification.new do |gem|
   gem.license = "LGPL-3.0"
 
   gem.executables = ["sidekiq", "sidekiqmon"]
-  gem.files = `git ls-files | grep -Ev '^(test|myapp|examples)'`.split("\n")
+  gem.files = ["sidekiq.gemspec", "README.md", "Changes.md", "LICENSE"] + `git ls-files | grep -E '^(bin|lib|web)'`.split("\n")
   gem.name = "sidekiq"
   gem.version = Sidekiq::VERSION
   gem.required_ruby_version = ">= 2.5.0"
 
+  gem.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/master/Changes.md",
+    "source_code_uri" => "https://github.com/mperham/sidekiq"
+  }
+
   gem.add_dependency "redis", ">= 4.2.0"
   gem.add_dependency "connection_pool", ">= 2.2.2"
   gem.add_dependency "rack", "~> 2.0"

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

@@ -147,3 +147,14 @@ input {
   fill: #ddd;
   color: #ddd;
 }
+
+.info-circle {
+  color: #282828;
+  background-color: #555555;
+  border-radius: 50%;
+  text-align: center;
+  vertical-align: middle;
+  padding: 3px 7px;
+  font-size: 0.7em;
+  margin-left: 5px;
+}

data/web/assets/stylesheets/application.css

@@ -127,6 +127,10 @@ header.row .pagination {
   width: 14%;
 }
 @media (max-width: 767px) and (min-width: 200px) {
+  .summary_bar {
+    font-size: 1.5em;
+  }
+
   .summary_bar ul li {
     width: 100%;
   }
@@ -186,7 +190,7 @@ form .btn {
 }
 
 form .btn-group .btn {
-  margin-right: 1px;
+  margin-right: 4px;
 }
 
 td form {
@@ -438,7 +442,7 @@ img.smallogo {
     margin: 5px 10px 5px 5px;
   }
   .stat p{
-    font-size: 1em;
+    font-size: 1.5em;
     margin: 5px 5px 5px 10px;
   }
 }
@@ -1153,10 +1157,9 @@ div.interval-slider input {
   width: 20%;
 }
 
-.circled {
-  border-color: #333;
-  color: #eee;
-  background-color: #b1003e;
+.info-circle {
+  color: #f3f3f3;
+  background-color: #dddddd;
   border-radius: 50%;
   text-align: center;
   vertical-align: middle;

data/web/views/busy.erb

@@ -1,8 +1,39 @@
 <div class="row header">
-  <div class="col-sm-8 pull-left flip">
+  <div class="col-sm-4 pull-left flip">
+    <h3><%= t('Status') %></h3>
+  </div>
+</div>
+
+<div class="table_container">
+  <div class="stats-container">
+    <div class="stat">
+      <h3><%= s = processes.size; number_with_delimiter(s) %></h3>
+      <p><%= t('Processes') %></p>
+    </div>
+    <div class="stat">
+      <h3><%= x = processes.total_concurrency; number_with_delimiter(x) %></h3>
+      <p><%= t('Threads') %></p>
+    </div>
+    <div class="stat">
+      <h3><%= ws = workers.size; number_with_delimiter(ws) %></h3>
+      <p><%= t('Busy') %></p>
+    </div>
+    <div class="stat">
+      <h3><%= x == 0 ? 0 : ((ws / x.to_f) * 100).round(0) %>%</h3>
+      <p><%= t('Utilization') %></p>
+    </div>
+    <div class="stat">
+      <h3><%= format_memory(processes.total_rss) %></h3>
+      <p><%= t('RSS') %></p>
+    </div>
+  </div>
+</div>
+
+<div class="row header">
+  <div class="col-sm-4 pull-left flip">
     <h3><%= t('Processes') %></h3>
   </div>
-  <div class="col-sm-4 pull-right flip">
+  <div class="col-sm-3 pull-right flip">
     <form method="POST" class="warning-messages">
       <%= csrf_tag %>
       <div class="btn-group pull-right flip">
@@ -12,15 +43,14 @@
     </form>
   </div>
 </div>
-
 <div class="table_container">
   <table class="processes table table-hover table-bordered table-striped">
     <thead>
       <th><%= t('Name') %></th>
       <th><%= t('Started') %></th>
-      <th><%= t('RSS') %><a href="https://github.com/mperham/sidekiq/wiki/Memory#rss"><span class="circled" title="Click to learn more about RSS">?</span></a></th>
-      <th><%= t('Threads') %></th>
-      <th><%= t('Busy') %></th>
+      <th class="col-sm-1"><%= t('RSS') %><a href="https://github.com/mperham/sidekiq/wiki/Memory#rss"><span class="info-circle" title="Click to learn more about RSS">?</span></a></th>
+      <th class="col-sm-1"><%= t('Threads') %></th>
+      <th class="col-sm-1"><%= t('Busy') %></th>
       <th>&nbsp;</th>
     </thead>
     <% lead = processes.leader %>
@@ -47,16 +77,14 @@
         <td><%= process['concurrency'] %></td>
         <td><%= process['busy'] %></td>
         <td>
-          <div class="btn-group pull-right flip">
-            <form method="POST">
+          <form method="POST">
+            <div class="btn-group pull-right flip">
               <%= csrf_tag %>
               <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
-              <% unless process.stopping? %>
-                <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
-              <% end %>
+              <% unless process.stopping? %><button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
               <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
-            </form>
-          </div>
+            </div>
+          </form>
         </td>
       </tr>
     <% end %>

data/web/views/layout.erb

@@ -16,6 +16,7 @@
     <link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" />
     <% end %>
 
+    <link rel="apple-touch-icon" href="<%= root_path %>images/apple-touch-icon.png">
     <link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
     <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
     <meta name="google" content="notranslate" />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 6.1.3
+  version: 6.2.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -61,33 +61,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE/bug_report.md"
-- ".github/contributing.md"
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".standard.yml"
-- 3.0-Upgrade.md
-- 4.0-Upgrade.md
-- 5.0-Upgrade.md
-- 6.0-Upgrade.md
-- COMM-LICENSE
 - Changes.md
-- Ent-2.0-Upgrade.md
-- Ent-Changes.md
-- Gemfile
-- Gemfile.lock
 - LICENSE
-- Pro-2.0-Upgrade.md
-- Pro-3.0-Upgrade.md
-- Pro-4.0-Upgrade.md
-- Pro-5.0-Upgrade.md
-- Pro-Changes.md
 - README.md
-- Rakefile
 - bin/sidekiq
 - bin/sidekiqload
 - bin/sidekiqmon
-- 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
@@ -130,6 +109,7 @@ files:
 - 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
@@ -189,7 +169,12 @@ files:
 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/master/Changes.md
+  source_code_uri: https://github.com/mperham/sidekiq
 post_install_message:
 rdoc_options: []
 require_paths:

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,20 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-Ruby version:
-Rails version:
-Sidekiq / Pro / Enterprise version(s):
-
-Please include your initializer, sidekiq.yml, and any error message with the full backtrace.
-
-If you are 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/.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/workflows/ci.yml

@@ -1,41 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [2.5, 2.6, 2.7]
-    services:
-      redis:
-        image: redis
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 6379:6379
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-      uses: ruby/setup-ruby@v1
-      with:
-        bundler-cache: true
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake

data/.gitignore

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

data/.standard.yml

@@ -1,20 +0,0 @@
-ruby_version: 2.5.0
-fix: false
-parallel: true
-ignore:
-  - test/**/*
-  - examples/**/*
-  - myapp/**/*
-  - 'lib/sidekiq.rb':
-    - Lint/InheritException
-  - 'lib/sidekiq/extensions/**/*':
-    - Style/MethodMissingSuper
-    - Style/MissingRespondToMissing
-  - 'lib/**/*':
-    - Naming/AsciiIdentifiers
-    - Lint/RescueException
-    - Security/YAMLLoad
-    - Naming/AccessorMethodName
-    - Naming/MethodName
-    - Style/GlobalVars
-    - Style/Alias

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