sidekiq 4.2.4 → 6.2.1

data/web/views/busy.erb

@@ -1,27 +1,59 @@
 <div class="row header">
-  <div class="col-sm-8 pull-left">
+  <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">
+  <div class="col-sm-3 pull-right flip">
     <form method="POST" class="warning-messages">
       <%= csrf_tag %>
-      <div class="btn-group pull-right">
+      <div class="btn-group pull-right flip">
         <button class="btn btn-warn" type="submit" name="quiet" value="1" data-confirm="<%= t('AreYouSure') %>"><%= t('QuietAll') %></button>
         <button class="btn btn-danger" type="submit" name="stop" value="1" data-confirm="<%= t('AreYouSure') %>"><%= t('StopAll') %></button>
       </div>
     </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 %>
     <% processes.each do |process| %>
       <tr>
         <td class="box">
@@ -31,26 +63,29 @@
             <span class="label label-info"><%= label %></span>
           <% end %>
           <% if process.stopping? %>
-            <span class="label label-danger">Quiet</span>
+            <span class="label label-danger">quiet</span>
+          <% end %>
+          <% if process.identity == lead %>
+            <span class="label label-warning">leader</span>
           <% end %>
           <br>
           <b><%= "#{t('Queues')}: " %></b>
           <%= 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">
-            <form method="POST">
-              <%= 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 %>
+          <form method="POST">
+            <%= csrf_tag %>
+            <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>
-            </form>
-          </div>
+            </div>
+          </form>
         </td>
       </tr>
     <% end %>
@@ -64,7 +99,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>
@@ -83,7 +118,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/dashboard.erb

@@ -7,11 +7,11 @@
       <span class="dot"></span>
     </span>
   </h3>
-  <div class="interval-slider">
+  <div class="interval-slider ltr">
     <span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
-    <span class="current-interval">2 sec</span>
+    <span class="current-interval">5 sec</span>
     <br/>
-    <input type="range" min="2000" max="20000" step="1000" value="2000"/>
+    <input type="range" min="2000" max="20000" step="1000" value="5000"/>
   </div>
 </div>
 

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

@@ -1,11 +1,22 @@
 <!doctype html>
-<html>
+<html dir="<%= text_direction %>">
   <head>
     <title><%= environment_title_prefix %><%= Sidekiq::NAME %></title>
-    <meta charset="utf8" />
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+
     <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
+    <% if rtl? %>
+    <link href="<%= root_path %>stylesheets/bootstrap-rtl.min.css" media="screen" rel="stylesheet" type="text/css"/>
+    <% 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 and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
+    <% if rtl? %>
+    <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">
@@ -42,29 +42,36 @@
             <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>
             <td>
+              <% if entry.error? %>
               <div><%= h truncate("#{entry['error_class']}: #{entry['error_message']}", 200) %></div>
+              <% end %>
             </td>
           </tr>
         <% end %>
       </table>
     </div>
-    <input class="btn btn-primary btn-xs pull-left" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger btn-xs pull-left" type="submit" name="delete" value="<%= t('Delete') %>" />
+    <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') %>" />
   </form>
 
-  <form action="<%= root_path %>morgue/all/delete" method="post">
-    <%= csrf_tag %>
-    <input class="btn btn-danger btn-xs pull-right" 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" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-  </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') %>" />
+    </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') %>" />
+    </form>
+  <% end %>
 
 <% else %>
   <div class="alert alert-success"><%= t('NoDeadJobsFound') %></div>

data/web/views/queue.erb

@@ -5,36 +5,46 @@
       <% if @queue.paused? %>
         <span class="label label-danger"><%= t('Paused') %></span>
       <% end %>
+      <span class="badge badge-secondary"><%= number_with_delimiter(@total_size) %></span>
     </h3>
   </div>
-  <div class="col-sm-4 pull-right">
-    <%= erb :_paging, locals: { url: "#{root_path}queues/#{@name}" } %>
+  <div class="col-sm-4 pull-right flip">
+    <%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>
   </div>
 </header>
 <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>
-          <% a = msg.display_args.inspect %>
-          <% if a.size > 100 %>
-            <%= h(msg.display_args.inspect[0..100]) + "... " %>
-            <button data-toggle="collapse" data-target="#worker_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
-            <div class="toggle" id="worker_<%= index %>"><%= h(msg.display_args) %></div>
+          <%= h(msg.display_class) %>
+          <%= display_tags(msg, nil) %>
+        </td>
+        <td>
+          <% a = msg.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>
           <% else %>
-            <%= h(msg.display_args) %>
+            <%= display_args(msg.display_args) %>
           <% end %>
         </td>
         <td>
-          <form action="<%= root_path %>queues/<%= @name %>/delete" method="post">
+          <form action="<%= root_path %>queues/<%= CGI.escape(@name) %>/delete" method="post">
             <%= csrf_tag %>
-            <input name="key_val" value="<%= h Sidekiq.dump_json(msg.item) %>" type="hidden" />
+            <input name="key_val" value="<%= h msg.value %>" type="hidden" />
             <input class="btn btn-danger btn-xs" type="submit" name="delete" value="<%= t('Delete') %>" data-confirm="<%= t('AreYouSure') %>" />
           </form>
         </td>
@@ -42,4 +52,4 @@
     <% end %>
   </table>
 </div>
-<%= erb :_paging, locals: { url: "#{root_path}queues/#{@name}" } %>
+<%= erb :_paging, locals: { url: "#{root_path}queues/#{CGI.escape(@name)}" } %>

data/web/views/queues.erb

@@ -1,25 +1,35 @@
 <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>
+      <th><%= t('Latency') %></th>
       <th><%= t('Actions') %></th>
     </thead>
     <% @queues.each do |queue| %>
       <tr>
         <td>
-          <a href="<%= root_path %>queues/<%= queue.name %>"><%= queue.name %></a>
+          <a href="<%= root_path %>queues/<%= CGI.escape(queue.name) %>"><%= h queue.name %></a>
           <% if queue.paused? %>
             <span class="label label-danger"><%= t('Paused') %></span>
           <% end %>
         </td>
         <td><%= number_with_delimiter(queue.size) %> </td>
+        <td><% queue_latency = queue.latency %><%= number_with_delimiter(queue_latency.round(2)) %><%= (queue_latency < 60) ? '' : " (#{relative_time(Time.at(Time.now.to_f - queue_latency))})" %> </td>
         <td class="delete-confirm">
-          <form action="<%=root_path %>queues/<%= queue.name %>" method="post">
+          <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

@@ -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">
@@ -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>
@@ -55,19 +58,25 @@
         <% end %>
       </table>
     </div>
-    <input class="btn btn-primary btn-xs pull-left" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-    <input class="btn btn-danger btn-xs pull-left" type="submit" name="delete" value="<%= t('Delete') %>" />
-    <input class="btn btn-danger btn-xs pull-left" type="submit" name="kill" value="<%= t('Kill') %>" />
+    <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') %>" />
   </form>
 
-  <form action="<%= root_path %>retries/all/delete" method="post">
-    <%= csrf_tag %>
-    <input class="btn btn-danger btn-xs pull-right" 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" type="submit" name="retry" value="<%= t('RetryAll') %>" data-confirm="<%= t('AreYouSure') %>" />
-  </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') %>" />
+    </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') %>" />
+    </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') %>" />
+    </form>
+  <% end %>
 
 <% else %>
   <div class="alert alert-success"><%= t('NoRetriesFound') %></div>

data/web/views/retry.erb

@@ -7,18 +7,18 @@
       <tr>
         <th><%= t('ErrorClass') %></th>
         <td>
-          <code><%= h @retry.display_class %></code>
+          <code><%= h @retry['error_class'] %></code>
         </td>
       </tr>
       <tr>
         <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

@@ -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">
@@ -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>
@@ -46,8 +49,8 @@
         <% end %>
       </table>
     </div>
-    <input class="btn btn-danger pull-right" type="submit" name="delete" value="<%= t('Delete') %>" />
-    <input class="btn btn-danger pull-right" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />
+    <input class="btn btn-danger pull-right flip" type="submit" name="delete" value="<%= t('Delete') %>" />
+    <input class="btn btn-danger pull-right flip" type="submit" name="add_to_queue" value="<%= t('AddToQueue') %>" />
   </form>
 <% else %>
   <div class="alert alert-success"><%= t('NoScheduledFound') %></div>