sidekiq 2.15.1 → 4.2.10

data/web/views/_nav.erb

@@ -1,33 +1,66 @@
-<div class="navbar-inner">
-  <div class="container">
-    <a class="navbar-brand" href="<%= root_path %>">
-      <%= Sidekiq::NAME %>
-      <%= erb :_status %>
-    </a>
-    <ul class="nav navbar-nav">
-      <% tabs.each do |title, url| %>
-        <% if url == '' %>
-          <li class="<%= current_path == url ? 'active' : '' %>">
+<div class="navbar navbar-default navbar-fixed-top">
+  <div class="container-fluid">
+    <div class="navbar-header" data-navbar="static">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-menu">
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <div class="navbar-toggle collapsed navbar-livereload">
+        <%= erb :_poll_link %>
+        <% if Sidekiq::Web.app_url %>
+          <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
+        <% end %>
+      </div>
+      <a class="navbar-brand" href="<%= root_path %>">
+        <%= Sidekiq::NAME %>
+        <%= erb :_status %>
+      </a>
+    </div>
+
+    <div class="collapse navbar-collapse" id="navbar-menu">
+      <ul class="nav navbar-nav" data-navbar="static">
+        <% Sidekiq::Web.default_tabs.each do |title, url| %>
+          <% if url == '' %>
+            <li class="<%= current_path == url ? 'active' : '' %>">
             <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
-          </li>
-        <% else %>
-          <li class="<%= current_path.start_with?(url) ? 'active' : '' %>">
+            </li>
+          <% else %>
+            <li class="<%= current_path.start_with?(url) ? 'active' : '' %>">
             <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
-          </li>
+            </li>
+          <% end %>
         <% end %>
-      <% end %>
-      <% custom_tabs.each do |title, url| %>
-        <li class="<%= current_path.start_with?(url) ? 'active' : '' %>">
-          <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
-        </li>
-      <% end %>
-
 
+        <li class="dropdown" data-navbar="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
+            <%= t('Plugins') %> <span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu" role="menu">
+            <% Sidekiq::Web.custom_tabs.each do |title, url| %>
+              <li>
+                <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
+              </li>
+            <% end %>
+          </ul>
+        </li>
 
-    </ul>
-
-    <div class="col-sm-2 pull-right poll-wrapper">
-      <%= erb :_poll %>
+        <% Sidekiq::Web.custom_tabs.each do |title, url| %>
+          <li class="<%= current_path.start_with?(url) ? 'active' : '' %>" data-navbar="custom-tab">
+            <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
+          </li>
+        <% end %>
+      </ul>
+      <ul class="nav navbar-nav navbar-right navbar-livereload" data-navbar="static">
+        <li>
+          <div class="poll-wrapper pull-right">
+            <%= erb :_poll_link %>
+            <% if Sidekiq::Web.app_url %>
+              <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>"><%= t('BackToApp') %></a>
+            <% end %>
+          </div>
+        </li>
+      </ul>
     </div>
   </div>
 </div>

data/web/views/_paging.erb

@@ -1,23 +1,23 @@
 <% if @total_size > @count %>
   <ul class="pagination pull-right">
     <li class="<%= 'disabled' if @current_page == 1 %>">
-      <a href="<%= url %>?page=1">«</a>
+      <a href="<%= url %>?page=1">&laquo;</a>
     </li>
     <% if @current_page > 1 %>
       <li>
-        <a href="<%= url %>?page=<%= @current_page - 1 %>"><%= @current_page - 1 %></a>
+        <a href="<%= url %>?<%= qparams(page: @current_page - 1) %>"><%= @current_page - 1 %></a>
       </li>
     <% end %>
     <li class="disabled">
-      <a href="<%= url %>?page=<%= @current_page %>"><%= @current_page %></a>
+      <a href="<%= url %>?<%= qparams(page: @current_page) %>"><%= @current_page %></a>
     </li>
     <% if @total_size > @current_page * @count %>
       <li>
-        <a href="<%= url %>?page=<%= @current_page + 1 %>"><%= @current_page + 1 %></a>
+        <a href="<%= url %>?<%= qparams(page: @current_page + 1) %>"><%= @current_page + 1 %></a>
       </li>
     <% end %>
     <li class="<%= 'disabled' if @total_size <= @current_page * @count %>">
-      <a href="<%= url %>?page=<%= (@total_size.to_f / @count).ceil %>">»</a>
+      <a href="<%= url %>?<%= qparams(page: (@total_size.to_f / @count).ceil) %>">&raquo;</a>
     </li>
   </ul>
 <% end %>

data/web/views/_poll_link.erb

@@ -0,0 +1,7 @@
+<% if current_path != '' %>
+  <% if params[:poll] %>
+    <a id="live-poll" class="btn btn-primary active" href="<%= root_path + current_path %>"><%= t('StopPolling') %></a>
+  <% else %>
+    <a id="live-poll" class="btn btn-primary" href="<%= root_path + current_path %>?<%= qparams(poll: true) %>"><%= t('LivePoll') %></a>
+  <% end %>
+<% end %>

data/web/views/_summary.erb

@@ -1,34 +1,40 @@
 <ul class="list-unstyled summary row">
-  <li class="processed col-sm-2">
+  <li class="processed col-sm-1">
     <span class="count"><%= number_with_delimiter(stats.processed) %></span>
     <span class="desc"><%= t('Processed') %></span>
   </li>
-  <li class="failed col-sm-2">
+  <li class="failed col-sm-1">
     <span class="count"><%= number_with_delimiter(stats.failed) %></span>
     <span class="desc"><%= t('Failed') %></span>
   </li>
-  <li class="busy col-sm-2">
-    <a href="<%= root_path %>workers">
-      <span class="count"><%= number_with_delimiter(workers_size) %></span>
+  <li class="busy col-sm-1">
+    <a href="<%= root_path %>busy">
+      <span class="count"><%= number_with_delimiter(workers.size) %></span>
       <span class="desc"><%= t('Busy') %></span>
     </a>
   </li>
-  <li class="scheduled col-sm-2">
-    <a href="<%= root_path %>scheduled">
-      <span class="count"><%= number_with_delimiter(stats.scheduled_size) %></span>
-      <span class="desc"><%= t('Scheduled') %></span>
+  <li class="enqueued col-sm-1">
+    <a href="<%= root_path %>queues">
+      <span class="count"><%= number_with_delimiter(stats.enqueued) %></span>
+      <span class="desc"><%= t('Enqueued') %></span>
     </a>
   </li>
-  <li class="retries col-sm-2">
+  <li class="retries col-sm-1">
     <a href="<%= root_path %>retries">
       <span class="count"><%= number_with_delimiter(stats.retry_size) %></span>
       <span class="desc"><%= t('Retries') %></span>
     </a>
   </li>
-  <li class="enqueued col-sm-2">
-    <a href="<%= root_path %>queues">
-      <span class="count"><%= number_with_delimiter(stats.enqueued) %></span>
-      <span class="desc"><%= t('Enqueued') %></span>
+  <li class="scheduled col-sm-1">
+    <a href="<%= root_path %>scheduled">
+      <span 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 class="desc"><%= t('Dead') %></span>
     </a>
   </li>
 </ul>

data/web/views/busy.erb

@@ -0,0 +1,94 @@
+<div class="row header">
+  <div class="col-sm-8 pull-left">
+    <h3><%= t('Processes') %></h3>
+  </div>
+  <div class="col-sm-4 pull-right">
+    <form method="POST" class="warning-messages">
+      <%= csrf_tag %>
+      <div class="btn-group pull-right">
+        <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">
+    <thead>
+      <th><%= t('Name') %></th>
+      <th><%= t('Started') %></th>
+      <th><%= t('Threads') %></th>
+      <th><%= t('Busy') %></th>
+      <th>&nbsp;</th>
+    </thead>
+    <% processes.each do |process| %>
+      <tr>
+        <td class="box">
+          <%= "#{process['hostname']}:#{process['pid']}" %>
+          <span class="label label-success"><%= process.tag %></span>
+          <% process.labels.each do |label| %>
+            <span class="label label-info"><%= label %></span>
+          <% end %>
+          <% if process.stopping? %>
+            <span class="label label-danger">Quiet</span>
+          <% end %>
+          <br>
+          <b><%= "#{t('Queues')}: " %></b>
+          <%= process['queues'] * ", " %>
+        </td>
+        <td><%= relative_time(Time.at(process['started_at'])) %></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 %>
+              <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
+            </form>
+          </div>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+</div>
+
+<div class="row header">
+  <div class="col-sm-7">
+    <h3><%= t('Jobs') %></h3>
+  </div>
+</div>
+
+<div class="table_container">
+  <table class="workers table table-hover table-bordered table-striped table-white">
+    <thead>
+      <th><%= t('Process') %></th>
+      <th><%= t('TID') %></th>
+      <th><%= t('JID') %></th>
+      <th><%= t('Queue') %></th>
+      <th><%= t('Job') %></th>
+      <th><%= t('Arguments') %></th>
+      <th><%= t('Started') %></th>
+    </thead>
+    <% workers.each do |process, thread, msg| %>
+      <% job = Sidekiq::Job.new(msg['payload']) %>
+      <tr>
+        <td><%= process %></td>
+        <td><%= thread %></td>
+        <td><%= job.jid %></td>
+        <td>
+          <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
+        </td>
+        <td><%= job.display_class %></td>
+        <td>
+          <div class="args"><%= display_args(job.display_args) %></div>
+        </td>
+        <td><%= relative_time(Time.at(msg['run_at'])) %></td>
+      </tr>
+    <% end %>
+  </table>
+</div>

data/web/views/dashboard.erb

@@ -1,24 +1,37 @@
 <script type="text/javascript" src="<%= root_path %>javascripts/dashboard.js"></script>
+<div class= "dashboard clearfix">
+  <h3 >
+    <%= t('Dashboard') %>
+    <span class="beacon">
+      <span class="ring"></span>
+      <span class="dot"></span>
+    </span>
+  </h3>
+  <div class="interval-slider">
+    <span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
+    <span class="current-interval">5 sec</span>
+    <br/>
+    <input type="range" min="2000" max="20000" step="1000" value="5000"/>
+  </div>
+</div>
+
+<div class="row chart">
+  <div id="realtime" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>"></div>
+  <div id="realtime-legend"></div>
+</div>
+
+<div class="row chart">
+  <h5>
+    <span class="history-heading"><%= t('History') %></span>
+    <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>
 
-<h3>
-  <%= t('Dashboard') %>
-  <span class="beacon">
-    <span class="ring"></span>
-    <span class="dot"></span>
-  </span>
-</h3>
-
-<h5></h5>
-<div id="realtime"></div>
-
-<h5>
-  <span class="history-heading"><%= t('History') %></span>
-  <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 id="history" data-processed="<%= h Sidekiq.dump_json(@processed_history) %>" data-failed="<%= h Sidekiq.dump_json(@failed_history) %>" data-update-url="<%= root_path %>dashboard/stats"></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>
@@ -45,14 +58,14 @@
       </div>
     <% end %>
 
-    <%  if @redis_info.fetch("used_memory_human", nil) %>
+    <% if @redis_info.fetch("used_memory_human", nil) %>
       <div class="stat">
         <h3 class="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) %>
+    <% 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>
         <p><%= t('PeakMemoryUsage') %></p>

data/web/views/dead.erb

@@ -0,0 +1,34 @@
+<%= erb :_job_info, locals: { job: @dead, type: :dead } %>
+
+<h3><%= t('Error') %></h3>
+<div class="table_container">
+  <table class="error table table-bordered table-striped">
+    <tbody>
+      <tr>
+        <th><%= t('ErrorClass') %></th>
+        <td>
+          <code><%= @dead['error_class'] %></code>
+        </td>
+      </tr>
+      <tr>
+        <th><%= t('ErrorMessage') %></th>
+        <td><%= h(@dead['error_message']) %></td>
+      </tr>
+      <% if !@dead['error_backtrace'].nil? %>
+        <tr>
+          <th><%= t('ErrorBacktrace') %></th>
+          <td>
+            <code><%= @dead['error_backtrace'].join("<br/>") %></code>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<form class="form-horizontal" action="<%= root_path %>morgue/<%= job_params(@dead, @dead.score) %>" method="post">
+  <%= csrf_tag %>
+  <a class="btn btn-default" href="<%= root_path %>morgue"><%= t('GoBack') %></a>
+  <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
+  <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
+</form>

data/web/views/layout.erb

@@ -1,18 +1,18 @@
 <!doctype html>
 <html>
   <head>
-    <title><%= Sidekiq::NAME %></title>
+    <title><%= environment_title_prefix %><%= Sidekiq::NAME %></title>
+    <meta charset="utf8" />
     <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" />
     <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
     <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
-    <script type="text/javascript" src="<%= root_path %>javascripts/locales/jquery.timeago.<%= locale %>.js"></script>
+    <meta name="google" content="notranslate" />
+    <%= display_custom_head %>
   </head>
-  <body class="admin">
-    <div class="navbar navbar-default navbar-fixed-top">
-      <%= erb :_nav %>
-    </div>
-
+  <body class="admin" data-poll-path="<%= poll_path %>" data-locale="<%= locale %>">
+    <%= erb :_nav %>
     <div id="page">
       <div class="container">
         <div class="row">
@@ -26,28 +26,6 @@
         </div>
       </div>
     </div>
-
-    <div class="navbar navbar-fixed-bottom navbar-inverse">
-      <div class="navbar-inner">
-        <div class="container">
-          <ul class="nav">
-            <li>
-              <p class="navbar-text" style="color:white;">Sidekiq v<%= Sidekiq::VERSION %></p>
-            </li>
-            <li>
-              <p class="navbar-text">Redis: <%= location %></p>
-            </li>
-            <li>
-              <p class="navbar-text"><%= t('Time') %>: <%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>
-            </li>
-            <% if namespace %>
-              <li>
-                <p class="navbar-text"><%= t('Namespace') %>: <%= namespace %></p>
-              </li>
-            <% end %>
-          </ul>
-        </div>
-      </div>
-    </div>
+    <%= erb :_footer %>
   </body>
 </html>

data/web/views/morgue.erb

@@ -0,0 +1,75 @@
+<header class="row">
+  <div class="col-sm-5">
+    <h3><%= t('DeadJobs') %></h3>
+  </div>
+  <% if @dead.size > 0 && @total_size > @count %>
+    <div class="col-sm-4">
+      <%= erb :_paging, locals: { url: "#{root_path}morgue" } %>
+    </div>
+  <% end %>
+  <%= filtering('dead') %>
+</header>
+
+<% if @dead.size > 0 %>
+  <form action="<%= root_path %>morgue" method="post">
+    <%= csrf_tag %>
+    <div class="table_container">
+      <table class="table table-striped table-bordered table-white">
+        <thead>
+          <tr>
+            <th class="table-checkbox checkbox-column">
+              <label>
+                <input type="checkbox" class="check_all" />
+              </label>
+            </th>
+            <th><%= t('LastRetry') %></th>
+            <th><%= t('Queue') %></th>
+            <th><%= t('Job') %></th>
+            <th><%= t('Arguments') %></th>
+            <th><%= t('Error') %></th>
+          </tr>
+        </thead>
+        <% @dead.each do |entry| %>
+          <tr>
+            <td class="table-checkbox">
+              <label>
+                <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
+              </label>
+            </td>
+            <td>
+              <a href="<%= root_path %>morgue/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>
+            </td>
+            <td>
+              <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
+            </td>
+            <td><%= entry.display_class %></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') %>" />
+  </form>
+
+  <% unfiltered? do %>
+    <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>
+  <% end %>
+
+<% else %>
+  <div class="alert alert-success"><%= t('NoDeadJobsFound') %></div>
+<% end %>