sidekiq 6.0.7 → 6.2.0

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%;
   }
@@ -177,10 +181,6 @@ header.row .pagination {
   overflow: overlay;
 }
 
-table.table-white {
-  background-color: #fff;
-}
-
 .queues form {
   margin: 0;
 }
@@ -190,7 +190,7 @@ form .btn {
 }
 
 form .btn-group .btn {
-  margin-right: 1px;
+  margin-right: 4px;
 }
 
 td form {
@@ -442,7 +442,7 @@ img.smallogo {
     margin: 5px 10px 5px 5px;
   }
   .stat p{
-    font-size: 1em;
+    font-size: 1.5em;
     margin: 5px 5px 5px 10px;
   }
 }
@@ -469,6 +469,11 @@ span.current-interval {
 
 div.interval-slider input {
   width: 160px;
+  -webkit-appearance: none;
+  height: 3px;
+  margin-top: 5px;
+  border-radius: 2px;
+  background: currentcolor;
 }
 
 #realtime-legend,
@@ -757,7 +762,7 @@ div.interval-slider input {
     font-family: Arial, sans-serif;
     border-radius: 3px;
     padding: 6px;
-    opacity: .5;
+    opacity: .7;
     border: 1px solid #e0e0e0;
     font-size: 12px;
     position: absolute;
@@ -972,7 +977,7 @@ div.interval-slider input {
 }
 .rickshaw_graph .y_ticks text,
 .rickshaw_graph .x_ticks_d3 text {
-    opacity: .5;
+    opacity: .7;
     font-size: 12px;
     pointer-events: none
 }
@@ -1151,3 +1156,14 @@ div.interval-slider input {
 .delete-confirm {
   width: 20%;
 }
+
+.info-circle {
+  color: #f3f3f3;
+  background-color: #dddddd;
+  border-radius: 50%;
+  text-align: center;
+  vertical-align: middle;
+  padding: 3px 7px;
+  font-size: 0.7em;
+  margin-left: 5px;
+}

data/web/locales/fr.yml

@@ -72,7 +72,7 @@ fr:
   Quiet: Clore
   StopAll: Tout arrêter
   QuietAll: Tout clore
-  PollingInterval: Interval de rafraîchissement
+  PollingInterval: Intervalle de rafraîchissement
   Plugins: Plugins
   NotYetEnqueued: Pas encore en file d'attente
   CreatedAt: Créée le

data/web/locales/pl.yml

@@ -10,7 +10,7 @@ pl:
   Processed: Ukończone
   Failed: Nieudane
   Scheduled: Zaplanowane
-  Retries: Prób
+  Retries: Do ponowienia
   Enqueued: Zakolejkowane
   Worker: Worker
   LivePoll: Wczytuj na żywo
@@ -29,15 +29,15 @@ pl:
   Queues: Kolejki
   Size: Rozmiar
   Actions: Akcje
-  NextRetry: Kolejna próba
-  RetryCount: Liczba prób
+  NextRetry: Następne ponowienie
+  RetryCount: Ilość ponowień
   RetryNow: Ponów teraz
   LastRetry: Ostatnie ponowienie
   OriginallyFailed: Ostatnio nieudane
   AreYouSure: Na pewno?
   DeleteAll: Usuń wszystko
   RetryAll: Powtórz wszystko
-  NoRetriesFound: Brak powtórzeń
+  NoRetriesFound: Brak zadań do ponowienia
   Error: Błąd
   ErrorClass: Klasa błędu
   ErrorMessage: Wiadomosć błędu

data/web/locales/ru.yml

@@ -38,6 +38,7 @@ ru:
   AreYouSure: Вы уверены?
   DeleteAll: Удалить все
   RetryAll: Повторить все
+  KillAll: Убить всё
   NoRetriesFound: Нет попыток
   Error: Ошибка
   ErrorClass: Класс ошибки
@@ -76,3 +77,6 @@ ru:
   NotYetEnqueued: Пока не в очереди
   CreatedAt: Создан
   BackToApp: Назад
+  Latency: Задержка
+  Pause: Пауза
+  Unpause: Возобновить

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,14 +43,14 @@
     </form>
   </div>
 </div>
-
 <div class="table_container">
-  <table class="processes table table-hover table-bordered table-striped table-white">
+  <table class="processes table table-hover table-bordered table-striped">
     <thead>
       <th><%= t('Name') %></th>
       <th><%= t('Started') %></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 %>
@@ -42,19 +73,18 @@
           <%= process['queues'] * ", " %>
         </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>
-          <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 %>
@@ -68,7 +98,7 @@
 </div>
 
 <div class="table_container">
-  <table class="workers table table-hover table-bordered table-striped table-white">
+  <table class="workers table table-hover table-bordered table-striped">
     <thead>
       <th><%= t('Process') %></th>
       <th><%= t('TID') %></th>

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" />

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">
         <thead>
           <tr>
             <th class="table-checkbox checkbox-column">

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>

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">
         <thead>
           <tr>
             <th class="table-checkbox checkbox-column">

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">
         <thead>
           <tr>
             <th class="checkbox-column">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 6.0.7
+  version: 6.2.0
 platform: ruby
 authors:
 - Mike Perham
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ 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: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 description: Simple, efficient background processing for Ruby.
 email:
 - mperham@gmail.com
@@ -75,33 +61,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".github/contributing.md"
-- ".github/issue_template.md"
-- ".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
@@ -139,10 +104,12 @@ files:
 - 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
@@ -199,11 +166,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/master/Changes.md
+  source_code_uri: https://github.com/mperham/sidekiq
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,8 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Simple, efficient background processing for Ruby
 test_files: []

data/.circleci/config.yml

@@ -1,60 +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"