sidekiq 6.0.0 → 6.0.5

data/sidekiq.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.homepage = "http://sidekiq.org"
   gem.license = "LGPL-3.0"
 
-  gem.executables = ["sidekiq"]
+  gem.executables = ["sidekiq", "sidekiqmon"]
   gem.files = `git ls-files | grep -Ev '^(test|myapp|examples)'`.split("\n")
   gem.name = "sidekiq"
   gem.version = Sidekiq::VERSION
@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "redis", ">= 4.1.0"
   gem.add_dependency "connection_pool", ">= 2.2.2"
-  gem.add_dependency "rack", ">= 2.0.0"
+  gem.add_dependency "rack", "~> 2.0"
   gem.add_dependency "rack-protection", ">= 2.0.0"
 end

data/web/assets/javascripts/dashboard.js

@@ -27,7 +27,7 @@ var realtimeGraph = function(updatePath) {
     renderer: 'line',
     interpolation: 'linear',
 
-    series: new Rickshaw.Series.FixedDuration([{ name: graphElement.dataset.failedLabel, color: '#B1003E' }, { name: graphElement.dataset.processedLabel, color: '#006f68' }], undefined, {
+    series: new Rickshaw.Series.FixedDuration([{ name: graphElement.dataset.failedLabel, color: '#af0014' }, { name: graphElement.dataset.processedLabel, color: '#006f68' }], undefined, {
       timeInterval: timeInterval,
       maxDataPoints: 100,
     })
@@ -125,7 +125,7 @@ var historyGraph = function() {
     interpolation: 'linear',
     series: [
       {
-        color: "#B1003E",
+        color: "#af0014",
         data: failed,
         name: graphElement.dataset.failedLabel
       }, {

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/en.yml

@@ -79,3 +79,5 @@ en: # <---- change this to your locale code
   CreatedAt: Created At
   BackToApp: Back to App
   Latency: Latency
+  Pause: Pause
+  Unpause: Unpause

data/web/locales/ja.yml

@@ -79,3 +79,5 @@ ja:
   CreatedAt: 作成日時
   BackToApp: アプリに戻る
   Latency: レイテンシ
+  Pause: 一時停止
+  Unpause: 一時停止を解除

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/queues.erb

@@ -22,6 +22,14 @@
           <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)) %>" />
+
+            <% if Sidekiq.pro? %>
+              <% if queue.paused? %>
+                <input class="btn btn-danger btn-xs" type="submit" name="unpause" value="<%= t('Unpause') %>" />
+              <% else %>
+                <input class="btn btn-danger btn-xs" type="submit" name="pause" value="<%= t('Pause') %>" />
+              <% end %>
+            <% end %>
           </form>
         </td>
       </tr>

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: 6.0.0
+  version: 6.0.5
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -42,16 +42,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
@@ -71,6 +71,7 @@ email:
 - mperham@gmail.com
 executables:
 - sidekiq
+- sidekiqmon
 extensions: []
 extra_rdoc_files: []
 files:
@@ -145,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
@@ -212,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple, efficient background processing for Ruby