sidekiq 6.2.1 → 6.4.0

data/web/views/_summary.erb

@@ -1,39 +1,39 @@
 <ul class="list-unstyled summary row">
   <li class="processed col-sm-1">
-    <span class="count"><%= number_with_delimiter(stats.processed) %></span>
+    <span id="txtProcessed" class="count"><%= number_with_delimiter(stats.processed) %></span>
     <span class="desc"><%= t('Processed') %></span>
   </li>
   <li class="failed col-sm-1">
-    <span class="count"><%= number_with_delimiter(stats.failed) %></span>
+    <span id="txtFailed" class="count"><%= number_with_delimiter(stats.failed) %></span>
     <span class="desc"><%= t('Failed') %></span>
   </li>
   <li class="busy col-sm-1">
     <a href="<%= root_path %>busy">
-      <span class="count"><%= number_with_delimiter(workers.size) %></span>
+      <span id="txtBusy" class="count"><%= number_with_delimiter(workers.size) %></span>
       <span class="desc"><%= t('Busy') %></span>
     </a>
   </li>
   <li class="enqueued col-sm-1">
     <a href="<%= root_path %>queues">
-      <span class="count"><%= number_with_delimiter(stats.enqueued) %></span>
+      <span id="txtEnqueued" class="count"><%= number_with_delimiter(stats.enqueued) %></span>
       <span class="desc"><%= t('Enqueued') %></span>
     </a>
   </li>
   <li class="retries col-sm-1">
     <a href="<%= root_path %>retries">
-      <span class="count"><%= number_with_delimiter(stats.retry_size) %></span>
+      <span id="txtRetries" class="count"><%= number_with_delimiter(stats.retry_size) %></span>
       <span class="desc"><%= t('Retries') %></span>
     </a>
   </li>
   <li class="scheduled col-sm-1">
     <a href="<%= root_path %>scheduled">
-      <span class="count"><%= number_with_delimiter(stats.scheduled_size) %></span>
+      <span id="txtScheduled" class="count"><%= number_with_delimiter(stats.scheduled_size) %></span>
       <span class="desc"><%= t('Scheduled') %></span>
     </a>
   </li>
   <li class="dead col-sm-1">
     <a href="<%= root_path %>morgue">
-      <span class="count"><%= number_with_delimiter(stats.dead_size) %></span>
+      <span id="txtDead" class="count"><%= number_with_delimiter(stats.dead_size) %></span>
       <span class="desc"><%= t('Dead') %></span>
     </a>
   </li>

data/web/views/busy.erb

@@ -4,7 +4,7 @@
   </div>
 </div>
 
-<div class="table_container">
+<div class="stats-wrapper">
   <div class="stats-container">
     <div class="stat">
       <h3><%= s = processes.size; number_with_delimiter(s) %></h3>
@@ -70,7 +70,7 @@
           <% end %>
           <br>
           <b><%= "#{t('Queues')}: " %></b>
-          <%= process['queues'] * ", " %>
+          <%= process.queues.join(", ") %>
         </td>
         <td><%= relative_time(Time.at(process['started_at'])) %></td>
         <td><%= format_memory(process['rss'].to_i) %></td>
@@ -82,8 +82,8 @@
             <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
 
             <div class="btn-group pull-right flip">
-              <% 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>
+              <% unless process.stopping? %><button class="btn btn-xs btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
+              <button class="btn btn-xs btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
             </div>
           </form>
         </td>
@@ -110,7 +110,7 @@
       <th><%= t('Started') %></th>
     </thead>
     <% workers.each do |process, thread, msg| %>
-      <% job = Sidekiq::Job.new(msg['payload']) %>
+      <% job = Sidekiq::JobRecord.new(msg['payload']) %>
       <tr>
         <td><%= process %></td>
         <td><%= thread %></td>

data/web/views/dashboard.erb

@@ -2,16 +2,16 @@
 <div class= "dashboard clearfix">
   <h3 >
     <%= t('Dashboard') %>
-    <span class="beacon">
+    <span id="beacon" class="beacon">
       <span class="ring"></span>
       <span class="dot"></span>
     </span>
   </h3>
   <div class="interval-slider ltr">
     <span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
-    <span class="current-interval">5 sec</span>
+    <span id="sldr-text" class="current-interval">5 sec</span>
     <br/>
-    <input type="range" min="2000" max="20000" step="1000" value="5000"/>
+    <input id="sldr" type="range" min="2000" max="20000" step="1000" value="5000"/>
   </div>
 </div>
 
@@ -20,54 +20,62 @@
   <div id="realtime-legend"></div>
 </div>
 
-<div class="row chart">
-  <h5>
-    <span class="history-heading"><%= t('History') %></span>
+<div class="row header">
+   <div class="col-sm-4 pull-left flip">
+     <h3><%= t('History') %></h3>
+   </div>
+ </div>
+ <div class="row chart">
+   <div>
     <a href="<%= root_path %>?days=7" class="history-graph <%= "active" if params[:days] == "7" %>"><%= t('OneWeek') %></a>
     <a href="<%= root_path %>" class="history-graph <%= "active" if params[:days].nil? || params[:days] == "30" %>"><%= t('OneMonth') %></a>
     <a href="<%= root_path %>?days=90" class="history-graph <%= "active" if params[:days] == "90" %>"><%= t('ThreeMonths') %></a>
     <a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
-  </h5>
+  </div>
 
   <div id="history" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>" data-processed="<%= h Sidekiq.dump_json(@processed_history) %>" data-failed="<%= h Sidekiq.dump_json(@failed_history) %>" data-update-url="<%= root_path %>stats"></div>
   <div id="history-legend"></div>
 </div>
 
 <br/>
-<h5>Redis</h5>
-<div class="redis-wrapper">
+<div class="row header">
+  <div class="col-sm-4 pull-left flip">
+    <h3>Redis</h3>
+  </div>
+</div>
+<div class="stats-wrapper">
   <div class="stats-container">
     <% if @redis_info.fetch("redis_version", nil) %>
       <div class="stat">
-        <h3 class="redis_version"><%= @redis_info.fetch("redis_version") %></h3>
+        <h3 id="redis_version"><%= @redis_info.fetch("redis_version") %></h3>
         <p><%= t('Version') %></p>
       </div>
     <% end %>
 
     <% if @redis_info.fetch("uptime_in_days", nil) %>
       <div class="stat">
-        <h3 class="uptime_in_days"><%= @redis_info.fetch("uptime_in_days") %></h3>
+        <h3 id="uptime_in_days"><%= @redis_info.fetch("uptime_in_days") %></h3>
         <p><%= t('Uptime') %></p>
       </div>
     <% end %>
 
     <% if @redis_info.fetch("connected_clients", nil) %>
       <div class="stat">
-        <h3 class="connected_clients"><%= @redis_info.fetch("connected_clients") %></h3>
+        <h3 id="connected_clients"><%= @redis_info.fetch("connected_clients") %></h3>
         <p><%= t('Connections') %></p>
       </div>
     <% end %>
 
     <% if @redis_info.fetch("used_memory_human", nil) %>
       <div class="stat">
-        <h3 class="used_memory_human"><%= @redis_info.fetch("used_memory_human") %></h3>
+        <h3 id="used_memory_human"><%= @redis_info.fetch("used_memory_human") %></h3>
         <p><%= t('MemoryUsage') %></p>
       </div>
     <% end %>
 
     <% if @redis_info.fetch("used_memory_peak_human", nil) %>
       <div class="stat">
-        <h3 class="used_memory_peak_human"><%= @redis_info.fetch("used_memory_peak_human") %></h3>
+        <h3 id="used_memory_peak_human"><%= @redis_info.fetch("used_memory_peak_human") %></h3>
         <p><%= t('PeakMemoryUsage') %></p>
       </div>
     <% end %>

data/web/views/dead.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>

data/web/views/layout.erb

@@ -22,7 +22,7 @@
     <meta name="google" content="notranslate" />
     <%= display_custom_head %>
   </head>
-  <body class="admin" data-poll-path="<%= poll_path %>" data-locale="<%= locale %>">
+  <body class="admin" data-locale="<%= locale %>">
     <%= erb :_nav %>
     <div id="page">
       <div class="container">

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 class="table table-striped table-bordered table-hover">
         <thead>
           <tr>
             <th class="table-checkbox checkbox-column">
@@ -44,7 +44,7 @@
             </td>
             <td>
               <%= entry.display_class %>
-              <%= display_tags(entry, "morgue") %>
+              <%= display_tags(entry, "dead") %>
             </td>
             <td>
               <div class="args"><%= display_args(entry.display_args) %></div>
@@ -58,18 +58,18 @@
         <% end %>
       </table>
     </div>
-    <input class="btn btn-primary btn-xs pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger btn-xs pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
+    <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') %>" />
   </form>
 
   <% unfiltered? do %>
     <form action="<%= root_path %>morgue/all/delete" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger btn-xs pull-right flip" 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 %>morgue/all/retry" method="post">
       <%= csrf_tag %>
-      <input class="btn btn-danger btn-xs pull-right flip" 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>
   <% end %>
 

data/web/views/queue.erb

@@ -20,31 +20,31 @@
       <th><%= t('Arguments') %></th>
       <th></th>
     </thead>
-    <% @messages.each_with_index do |msg, index| %>
-      <tr>
+    <% @jobs.each_with_index do |job, index| %>
+      <tr title="<%= job.jid %>">
         <% 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) %>
+          <%= h(job.display_class) %>
+          <%= display_tags(job, nil) %>
         </td>
         <td>
-          <% a = msg.display_args %>
+          <% a = job.display_args %>
           <% if a.inspect.size > 100 %>
-            <span class="worker_<%= index %>"><%= h(a.inspect[0..100]) + "... " %></span>
-            <button data-toggle="collapse" data-target=".worker_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
-            <div class="toggle worker_<%= index %>"><%= display_args(a) %></div>
+            <span id="job_<%= index %>"><%= h(a.inspect[0..100]) + "... " %></span>
+            <button data-toggle="job_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
+            <div class="toggle" id="job_<%= index %>_full"><%= display_args(a) %></div>
           <% else %>
-            <%= display_args(msg.display_args) %>
+            <%= display_args(job.display_args) %>
           <% end %>
         </td>
         <td>
           <form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
             <%= csrf_tag %>
-            <input name="key_val" value="<%= h msg.value %>" type="hidden" />
+            <input name="key_val" value="<%= h job.value %>" type="hidden" />
             <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
           </form>
         </td>

data/web/views/queues.erb

@@ -21,13 +21,13 @@
         <td class="delete-confirm">
           <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)) %>" />
+            <input class="btn btn-danger" type="submit" name="delete" title="This will delete all jobs within the queue, it will reappear if you push more jobs to it in the future." 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') %>" />
+                <input class="btn btn-danger" type="submit" name="unpause" value="<%= t('Unpause') %>" />
               <% else %>
-                <input class="btn btn-danger btn-xs" type="submit" name="pause" value="<%= t('Pause') %>" />
+                <input class="btn btn-danger" type="submit" name="pause" value="<%= t('Pause') %>" />
               <% end %>
             <% end %>
           </form>

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 class="table table-striped table-bordered table-hover">
         <thead>
           <tr>
             <th class="table-checkbox checkbox-column">
@@ -58,23 +58,23 @@
         <% end %>
       </table>
     </div>
-    <input class="btn btn-primary btn-xs pull-left flip" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger btn-xs pull-left flip" type="submit" name="delete" value="<%= t('Delete') %>" />
-    <input class="btn btn-danger btn-xs pull-left flip" 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 flip" 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 flip" 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 btn-xs pull-right flip" type="submit" name="kill" value="<%= t('KillAll') %>" data-confirm="<%= t('AreYouSure') %>" />
+      <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>

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.4.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -67,10 +67,10 @@ files:
 - bin/sidekiq
 - bin/sidekiqload
 - bin/sidekiqmon
-- 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
+- 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
@@ -82,12 +82,15 @@ files:
 - 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/logger.rb
 - lib/sidekiq/manager.rb
 - lib/sidekiq/middleware/chain.rb
+- lib/sidekiq/middleware/current_attributes.rb
 - lib/sidekiq/middleware/i18n.rb
 - lib/sidekiq/monitor.rb
 - lib/sidekiq/paginator.rb
@@ -173,7 +176,7 @@ 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
+  changelog_uri: https://github.com/mperham/sidekiq/blob/main/Changes.md
   source_code_uri: https://github.com/mperham/sidekiq
 post_install_message:
 rdoc_options: []

data/lib/generators/sidekiq/worker_generator.rb

@@ -1,57 +0,0 @@
-require "rails/generators/named_base"
-
-module Sidekiq
-  module Generators # :nodoc:
-    class WorkerGenerator < ::Rails::Generators::NamedBase # :nodoc:
-      desc "This generator creates a Sidekiq Worker in app/workers and a corresponding test"
-
-      check_class_collision suffix: "Worker"
-
-      def self.default_generator_root
-        File.dirname(__FILE__)
-      end
-
-      def create_worker_file
-        template "worker.rb.erb", File.join("app/workers", class_path, "#{file_name}_worker.rb")
-      end
-
-      def create_test_file
-        return unless test_framework
-
-        if test_framework == :rspec
-          create_worker_spec
-        else
-          create_worker_test
-        end
-      end
-
-      private
-
-      def create_worker_spec
-        template_file = File.join(
-          "spec/workers",
-          class_path,
-          "#{file_name}_worker_spec.rb"
-        )
-        template "worker_spec.rb.erb", template_file
-      end
-
-      def create_worker_test
-        template_file = File.join(
-          "test/workers",
-          class_path,
-          "#{file_name}_worker_test.rb"
-        )
-        template "worker_test.rb.erb", template_file
-      end
-
-      def file_name
-        @_file_name ||= super.sub(/_?worker\z/i, "")
-      end
-
-      def test_framework
-        ::Rails.application.config.generators.options[:rails][:test_framework]
-      end
-    end
-  end
-end