sidekiq 5.2.6 → 6.0.3

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

@@ -0,0 +1,125 @@
+@media (prefers-color-scheme: dark) {
+
+  body {
+    background-color: #000;
+    color: #ccc;
+  }
+
+  a,
+  .title,
+  .summary_bar ul .count,
+  .navbar .navbar-brand {
+    color: #af0014;
+  }
+
+  .navbar .navbar-brand:hover {
+    color: #ccc;
+  }
+
+  .navbar .navbar-brand .status {
+    color: #ccc;
+  }
+
+  .navbar-inverse {
+    background-color: #000;
+    border-color: #333;
+  }
+
+  table.table-white {
+    background-color: #111;
+  }
+
+  .table-striped > tbody > tr:nth-of-type(odd) {
+    background-color: #222;
+  }
+
+  .table-bordered,
+  .table-bordered > tbody > tr > td,
+  .table-bordered > tbody > tr > th,
+  .table-bordered > tfoot > tr > td,
+  .table-bordered > tfoot > tr > th,
+  .table-bordered > thead > tr > td,
+  .table-bordered > thead > tr > th {
+    border: 1px solid #333;
+  }
+
+  .table-hover > tbody > tr:hover {
+    background-color: #333;
+  }
+
+  .alert {
+    border: none;
+    color: #ccc;
+  }
+
+  .alert-success {
+    background-color: #000;
+  }
+
+  a:link,
+  a:active,
+  a:hover,
+  a:visited {
+    color: #63798c;
+  }
+
+  a.btn {
+    color: #000;
+  }
+
+  .summary_bar .summary {
+    background-color: #000;
+    border: 1px solid #333;
+  }
+
+  .navbar-default {
+    background-color: #000;
+    border-color: #3d3d3d;
+  }
+
+  .navbar-default .navbar-nav > .active > a,
+  .navbar-default .navbar-nav > .active > a:focus,
+  .navbar-default .navbar-nav > .active > a:hover {
+    color: #ccc;
+    background-color: #282828;
+  }
+
+  .navbar-default .navbar-nav > li > a:hover {
+    color: #ccc;
+  }
+
+  .pagination > li > a,
+  .pagination > li > a:hover,
+  .pagination > li > span {
+    color: #ccc;
+    background-color: #282828;
+    border-color: #353535;
+  }
+  .pagination > .disabled > a,
+  .pagination > .disabled > a:focus,
+  .pagination > .disabled > a:hover,
+  .pagination > .disabled > span,
+  .pagination > .disabled > span:focus,
+  .pagination > .disabled > span:hover {
+    color: #a5a5a5;
+    background-color: #282828;
+    border-color: #353535;
+  }
+
+  .stat {
+    border: 1px solid rgba(255, 255, 255, 0.1);
+  }
+
+  #live-poll {
+    color: #ccc;
+  }
+
+  .btn-warn {
+    color: #333;
+  }
+
+  .rickshaw_graph .y_ticks.glow text {
+    fill: #ccc;
+    color: #ccc;
+  }
+}

data/web/assets/stylesheets/application.css

@@ -201,6 +201,15 @@ td form {
   padding: 0;
 }
 
+.jobtag a {
+  color: white;
+}
+
+.jobtag a:hover {
+  color: white;
+  text-decoration: underline;
+}
+
 table .table-checkbox label {
   height: 100%;
   width: 100%;

data/web/locales/de.yml

@@ -13,7 +13,7 @@ de:
   Retries: Versuche
   Enqueued: In der Warteschlange
   Worker: Arbeiter
-  LivePoll: Live Poll
+  LivePoll: Echtzeitabfrage
   StopPolling: Abfrage stoppen
   Queue: Warteschlange
   Class: Klasse
@@ -33,12 +33,13 @@ de:
   NextRetry: Nächster Versuch
   RetryCount: Anzahl der Versuche
   RetryNow: Jetzt erneut versuchen
-  Kill: Töten
+  Kill: Vernichten
   LastRetry: Letzter Versuch
   OriginallyFailed: Ursprünglich fehlgeschlagen
   AreYouSure: Bist du sicher?
   DeleteAll: Alle löschen
   RetryAll: Alle erneut versuchen
+  KillAll: Alle vernichten
   NoRetriesFound: Keine erneuten Versuche gefunden
   Error: Fehler
   ErrorClass: Fehlerklasse
@@ -67,3 +68,14 @@ de:
   Thread: Thread
   Threads: Threads
   Jobs: Jobs
+  Paused: Pausiert
+  Stop: Stopp
+  Quiet: Leise
+  StopAll: Alle stoppen
+  QuietAll: Alle leise
+  PollingInterval: Abfrageintervall
+  Plugins: Erweiterungen
+  NotYetEnqueued: Noch nicht in der Warteschlange
+  CreatedAt: Erstellt
+  BackToApp: Zurück zur Anwendung
+  Latency: Latenz

data/web/locales/ja.yml

@@ -33,11 +33,13 @@ ja:
   NextRetry: 再試行
   RetryCount: 再試行
   RetryNow: 今すぐ再試行
+  Kill: 強制終了
   LastRetry: 再試行履歴
   OriginallyFailed: 失敗
   AreYouSure: よろしいですか？
   DeleteAll: 全て削除
   RetryAll: 全て再試行
+  KillAll: 全て強制終了
   NoRetriesFound: 再試行するジョブはありません
   Error: エラー
   ErrorClass: エラークラス
@@ -58,7 +60,6 @@ ja:
   OneMonth: 1 ヶ月
   ThreeMonths: 3 ヶ月
   SixMonths: 6 ヶ月
-  Batches: バッチ
   Failures: 失敗
   DeadJobs: デッドジョブ
   NoDeadJobsFound: デッドジョブはありません

data/web/views/_job_info.erb

@@ -14,7 +14,8 @@
       <tr>
         <th><%= t('Job') %></th>
         <td>
-          <code><%= job.display_class %></code>
+          <%= job.display_class %>
+          <%= display_tags(job) %>
         </td>
       </tr>
       <tr>

data/web/views/busy.erb

@@ -87,7 +87,10 @@
         <td>
           <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
         </td>
-        <td><%= job.display_class %></td>
+        <td>
+          <%= job.display_class %>
+          <%= display_tags(job, nil) %>
+        </td>
         <td>
           <div class="args"><%= display_args(job.display_args) %></div>
         </td>

data/web/views/dead.erb

@@ -14,11 +14,11 @@
         <th><%= t('ErrorMessage') %></th>
         <td><%= h(@dead['error_message']) %></td>
       </tr>
-      <% if !@dead['error_backtrace'].nil? %>
+      <% if @dead.error_backtrace %>
         <tr>
           <th><%= t('ErrorBacktrace') %></th>
           <td>
-            <code><%= @dead['error_backtrace'].join("<br/>") %></code>
+            <code><%= @dead.error_backtrace.join("<br/>") %></code>
           </td>
         </tr>
       <% end %>

data/web/views/layout.erb

@@ -11,6 +11,7 @@
     <% end %>
 
     <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+    <link href="<%= root_path %>stylesheets/application-dark.css" media="screen" rel="stylesheet" type="text/css" />
     <% if rtl? %>
     <link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" />
     <% end %>

data/web/views/morgue.erb

@@ -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, "morgue") %>
+            </td>
             <td>
               <div class="args"><%= display_args(entry.display_args) %></div>
             </td>

data/web/views/queue.erb

@@ -15,13 +15,22 @@
 <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></th>
     </thead>
     <% @messages.each_with_index do |msg, index| %>
       <tr>
-        <td><%= h(msg.display_class) %></td>
+        <% if params[:direction] == 'asc' %>
+          <td><%= @count * (@current_page - 1) + index + 1 %></td>
+        <% else %>
+          <td><%= @total_size - (@count * (@current_page - 1) + index) %></td>
+        <% end %>
+        <td>
+          <%= h(msg.display_class) %>
+          <%= display_tags(msg, nil) %>
+        </td>
         <td>
           <% a = msg.display_args %>
           <% if a.inspect.size > 100 %>

data/web/views/retries.erb

@@ -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>

data/web/views/retry.erb

@@ -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

@@ -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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 5.2.6
+  version: 6.0.3
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -16,27 +16,18 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.1.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.2
@@ -44,9 +35,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
@@ -56,58 +44,63 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 2.0.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"
+- ".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/sidekiqctl
 - bin/sidekiqload
+- bin/sidekiqmon
 - code_of_conduct.md
 - lib/generators/sidekiq/templates/worker.rb.erb
 - lib/generators/sidekiq/templates/worker_spec.rb.erb
@@ -117,8 +110,6 @@ files:
 - lib/sidekiq/api.rb
 - lib/sidekiq/cli.rb
 - lib/sidekiq/client.rb
-- lib/sidekiq/core_ext.rb
-- lib/sidekiq/ctl.rb
 - lib/sidekiq/delay.rb
 - lib/sidekiq/exception_handler.rb
 - lib/sidekiq/extensions/action_mailer.rb
@@ -129,11 +120,11 @@ files:
 - lib/sidekiq/job_logger.rb
 - lib/sidekiq/job_retry.rb
 - lib/sidekiq/launcher.rb
-- lib/sidekiq/logging.rb
+- lib/sidekiq/logger.rb
 - lib/sidekiq/manager.rb
 - lib/sidekiq/middleware/chain.rb
 - lib/sidekiq/middleware/i18n.rb
-- lib/sidekiq/middleware/server/active_record.rb
+- lib/sidekiq/monitor.rb
 - lib/sidekiq/paginator.rb
 - lib/sidekiq/processor.rb
 - lib/sidekiq/rails.rb
@@ -155,6 +146,7 @@ files:
 - web/assets/images/status.png
 - web/assets/javascripts/application.js
 - web/assets/javascripts/dashboard.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
@@ -215,14 +207,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.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple, efficient background processing for Ruby